Updates build to 0.3.4 beta 1.

Note: build 0.3.3 was never promoted beyond beta 3, although there were
no reported issues that would have prevented a 0.3.3 release.

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

.directory

@@ -1,4 +0,0 @@
-[Dolphin]
-Timestamp=2015,9,8,20,39,49
-Version=3
-ViewMode=1

.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

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

.idea/compiler.xml

@@ -1,22 +1,9 @@
 <?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>
+    <bytecodeTargetLevel>
+      <module name="sdr-trunk_main" target="1.8" />
+      <module name="sdr-trunk_test" target="1.8" />
+    </bytecodeTargetLevel>
   </component>
 </project>

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

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

.idea/dictionaries/denny.xml

@@ -1,25 +0,0 @@
-<component name="ProjectDictionaryState">
-  <dictionary name="denny">
-    <words>
-      <w>bahroo</w>
-      <w>broadcastify</w>
-      <w>esnid</w>
-      <w>fleetsync</w>
-      <w>icecast</w>
-      <w>ident</w>
-      <w>overflowable</w>
-      <w>polyphase</w>
-      <w>remez</w>
-      <w>samplerate</w>
-      <w>sdrtrunk</w>
-      <w>sheirer</w>
-      <w>shoutcast</w>
-      <w>streamable</w>
-      <w>talkgroup</w>
-      <w>tgid</w>
-      <w>ultravox</w>
-      <w>wacn</w>
-      <w>xtea</w>
-    </words>
-  </dictionary>
-</component>

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

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

.idea/misc.xml

@@ -1,43 +1,5 @@
 <?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>
   <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>

.idea/modules.xml

@@ -2,7 +2,9 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/sdrtrunk.iml" filepath="$PROJECT_DIR$/sdrtrunk.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/sdr-trunk.iml" filepath="$PROJECT_DIR$/.idea/modules/sdr-trunk.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/sdr-trunk_main.iml" filepath="$PROJECT_DIR$/.idea/modules/sdr-trunk_main.iml" group="sdr-trunk" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/sdr-trunk_test.iml" filepath="$PROJECT_DIR$/.idea/modules/sdr-trunk_test.iml" group="sdr-trunk" />
     </modules>
   </component>
 </project>

.idea/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>

.idea/vcs.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
   </component>
 </project>

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

.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

CHANGELOG

@@ -1,5 +1,23 @@
+0.3.4 20180210
+ - 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.0-beta1 20170129
+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 +52,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

README.md

@@ -1,10 +1,78 @@
 # 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/GettingStarted_V0.3.0)
+* [User's Manual Version 0.3.0](https://github.com/DSheirer/sdrtrunk/wiki/UserManual_V0.3.0)
 * [Download](https://github.com/DSheirer/sdrtrunk/releases)
 * [Support](https://groups.google.com/forum/#!forum/sdrtrunk)
 
-![sdrtrunk Application Overview - Version 0.3.0](https://github.com/DSheirer/sdrtrunk/wiki/images/ApplicationOverview_V0.3.0.png)
+![sdrtrunk Application Overview - Version 0.3.0](https://github.com/DSheirer/sdrtrunk/wiki/v0.3/images/ApplicationOverview_V0.3.0.png)
 **Figure 1:** sdrtrunk **Version 0.3.0** Application Screenshot
+
+# End User Instructions:
+
+If you simply want to download and run the program, please follow these instructions.
+
+## Install Java 8 (or newer)
+
+## Download the latest sdrtrunk release
+ 
+All release versions of sdrtrunk are available from the [releases](https://github.com/DSheirer/sdrtrunk/releases) tab.
+
+**(final)** These versions have been tested and are the current release version.
+
+**(beta)** These versions are currently being tested for bugs and functionality.
+
+## Run the application
+
+Either double-click on the downloaded file (if supported on your operating system) or open a terminal/command window
+and change to the directory where you downloaded the release file and type:
+
+```
+java -jar downloaded-jar-filename 
+```
+
+Note: replace _downloaded-jar-filename_ with the actual name of the sdrtrunk release version that you downloaded 
+
+## Optional - P25 Audio
+If you're using sdrtrunk with a P25 trunked radio system, the [JMBE](https://github.com/DSheirer/sdrtrunk/wiki/JMBE) wiki page contains instructions
+for downloading the JMBE audio library source code and compiling the JMBE library.  Copy the resulting JMBE audio library 
+jar file to the same folder containing the sdrtrunk application to use the library with sdrtrunk.
+
+# Developer Instructions:
+
+If you're interested in modifying and/or compiling the source code, please follow these instructions to use gradle to compile the code. 
+
+## Build the project
+sdrtrunk uses gradle as the build system. You can build it with locally installed gradle or if you do not have/want 
+to install gradle you can use preconfigured linux/windows wrapper.
+
+### Build with locally installed gradle 4.3.1
+```
+gradle clean buildSdr
+```
+### Build with preconfigured wrapper for linux/windows
+Linux
+```
+./gradlew clean buildSdr
+```
+Windows
+```
+gradle.bat clean buildSdr
+```
+This would add gradle, download all project dependencies and build JAR
+
+## Development
+All dependencies/versions are controlled from build.gradle.
+To change the new release version tag of artifact - change property:
+```
+version = '0.3.2'
+```
+
+## Run SDRTrunk
+SDRTrunk is packed into single uber-jar file. There is need to have folders with dependencies and
+adding them with classpath. Just run with java.
+### Use Java8
+```
+java -jar build/libs/sdr-trunk-all-0.3.2.jar 
+```

build.gradle

@@ -0,0 +1,75 @@
+buildscript {
+    repositories {
+        jcenter()
+        mavenCentral()
+    }
+    dependencies {
+    }
+}
+
+apply plugin: 'java'
+apply plugin: 'idea'
+
+repositories {
+    jcenter()
+    mavenCentral()
+}
+
+version = '0.3.4-beta.1'
+sourceCompatibility = 1.8
+
+sourceSets {
+    main.java.srcDirs 'src/main'
+    test.java.srcDirs 'src/test'
+}
+
+idea {
+    module {
+        downloadJavadoc = true
+        downloadSources = true
+    }
+}
+
+dependencies {
+    testCompile 'junit:junit:4.12'
+    testCompile 'org.assertj:assertj-core:3.8.0'
+    compile fileTree(dir: 'imports', include: '*.jar')
+    compile 'org.apache.commons:commons-lang3:3.7'
+    compile 'org.apache.commons:commons-io:1.3.2'
+    compile 'org.slf4j:slf4j-api:1.7.25'
+    compile 'ch.qos.logback:logback-core:1.2.3'
+    compile 'ch.qos.logback:logback-classic:1.2.3'
+    compile 'com.miglayout:miglayout-swing:5.0'
+
+    compile 'org.usb4java:usb4java-javax:1.2.0'
+    compile 'org.usb4java:usb4java:1.2.0'
+    compile 'org.usb4java:libusb4java:1.2.0'
+    compile 'javax.usb:usb-api:1.0.2'
+    compile 'com.github.wendykierp:JTransforms:3.1'
+    compile 'pl.edu.icm:JLargeArrays:1.6'
+    compile 'net.coderazzi:tablefilter-swing:5.3.1'
+    compile 'com.jidesoft:jide-oss:3.4.3'
+    compile 'org.apache.mina:mina-core:2.0.16'
+    compile 'org.apache.mina:mina-http:2.0.16'
+    compile 'org.apache.axis:axis-jaxrpc:1.4'
+    compile 'org.apache.axis:axis:1.4'
+    compile 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.9.3'
+    compile 'org.kordamp.ikonli:ikonli-javafx:2.1.1'
+    compile 'org.kordamp.ikonli:ikonli-fontawesome-pack:2.1.1'
+}
+
+task wrapper(type: Wrapper) {
+    gradleVersion = '4.3.1'
+}
+
+task buildSdr(type: Jar) {
+    manifest {
+        attributes 'Implementation-Title': 'SdrTrunk project',
+                'Implementation-Version': version,
+                'Main-Class': 'io.github.dsheirer.gui.SDRTrunk',
+                'Class-Path': 'jmbe-0.3.2.jar jmbe-0.3.3.jar'
+    }
+    baseName = project.name + '-all'
+    from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } }
+    with jar
+}

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>

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>

gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,5 @@
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.3.1-bin.zip
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStorePath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -0,0 +1,172 @@
+#!/usr/bin/env sh
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+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" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"

gradlew.bat

@@ -0,0 +1,84 @@
+@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=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@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=
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+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 init
+
+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
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

images/.directory

@@ -1,4 +0,0 @@
-[Dolphin]
-PreviewsShown=true
-Timestamp=2013,9,20,8,54,21
-Version=3

imports/.directory

@@ -1,4 +0,0 @@
-[Dolphin]
-Timestamp=2013,4,7,10,12,39
-Version=3
-ViewMode=1

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

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

sdr-trunk.ipr

@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <option name="DEFAULT_COMPILER" value="Javac"/>
+    <resourceExtensions>
+      <entry name=".+\.(properties|xml|html|dtd|tld)"/>
+      <entry name=".+\.(gif|png|jpeg|jpg)"/>
+    </resourceExtensions>
+    <wildcardResourcePatterns>
+      <entry name="!?*.class"/>
+      <entry name="!?*.scala"/>
+      <entry name="!?*.java"/>
+      <entry name="!?*.groovy"/>
+    </wildcardResourcePatterns>
+    <annotationProcessing enabled="false" useClasspath="true"/>
+    <bytecodeTargetLevel target="1.8"/>
+  </component>
+  <component name="CopyrightManager" default="">
+    <module2copyright/>
+  </component>
+  <component name="DependencyValidationManager">
+    <option name="SKIP_IMPORT_STATEMENTS" value="false"/>
+  </component>
+  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false"/>
+  <component name="GradleUISettings">
+    <setting name="root"/>
+  </component>
+  <component name="GradleUISettings2">
+    <setting name="root"/>
+  </component>
+  <component name="IdProvider" IDEtalkID="11DA1DB66DD62DDA1ED602B7079FE97C"/>
+  <component name="JavadocGenerationManager">
+    <option name="OUTPUT_DIRECTORY"/>
+    <option name="OPTION_SCOPE" value="protected"/>
+    <option name="OPTION_HIERARCHY" value="true"/>
+    <option name="OPTION_NAVIGATOR" value="true"/>
+    <option name="OPTION_INDEX" value="true"/>
+    <option name="OPTION_SEPARATE_INDEX" value="true"/>
+    <option name="OPTION_DOCUMENT_TAG_USE" value="false"/>
+    <option name="OPTION_DOCUMENT_TAG_AUTHOR" value="false"/>
+    <option name="OPTION_DOCUMENT_TAG_VERSION" value="false"/>
+    <option name="OPTION_DOCUMENT_TAG_DEPRECATED" value="true"/>
+    <option name="OPTION_DEPRECATED_LIST" value="true"/>
+    <option name="OTHER_OPTIONS" value=""/>
+    <option name="HEAP_SIZE"/>
+    <option name="LOCALE"/>
+    <option name="OPEN_IN_BROWSER" value="true"/>
+  </component>
+  <component name="ProjectModuleManager">
+    <modules>
+      <module filepath="$PROJECT_DIR$/sdr-trunk.iml" fileurl="file://$PROJECT_DIR$/sdr-trunk.iml"/>
+    </modules>
+  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" assert-keyword="true" jdk-15="true" project-jdk-type="JavaSDK" assert-jdk-15="true" project-jdk-name="1.8">
+    <output url="file://$PROJECT_DIR$/out"/>
+  </component>
+  <component name="SvnBranchConfigurationManager">
+    <option name="mySupportsUserInfoFilter" value="true"/>
+  </component>
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs=""/>
+  </component>
+  <component name="masterDetails">
+    <states>
+      <state key="ArtifactsStructureConfigurable.UI">
+        <UIState>
+          <splitter-proportions>
+            <SplitterProportionsDataImpl/>
+          </splitter-proportions>
+          <settings/>
+        </UIState>
+      </state>
+      <state key="Copyright.UI">
+        <UIState>
+          <splitter-proportions>
+            <SplitterProportionsDataImpl/>
+          </splitter-proportions>
+        </UIState>
+      </state>
+      <state key="ProjectJDKs.UI">
+        <UIState>
+          <splitter-proportions>
+            <SplitterProportionsDataImpl>
+              <option name="proportions">
+                <list>
+                  <option value="0.2"/>
+                </list>
+              </option>
+            </SplitterProportionsDataImpl>
+          </splitter-proportions>
+          <last-edited>1.6</last-edited>
+        </UIState>
+      </state>
+      <state key="ScopeChooserConfigurable.UI">
+        <UIState>
+          <splitter-proportions>
+            <SplitterProportionsDataImpl/>
+          </splitter-proportions>
+          <settings/>
+        </UIState>
+      </state>
+    </states>
+  </component>
+</project>

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>

settings.gradle

@@ -0,0 +1 @@
+rootProject.name = 'sdr-trunk'

src/.directory

@@ -1,4 +0,0 @@
-[Dolphin]
-Timestamp=2015,9,1,6,42,59
-Version=3
-ViewMode=1

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;
-	}
-}

src/alias/action/AliasAction.java

@@ -1,58 +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.action;
-
-import alias.Alias;
-import alias.action.beep.BeepAction;
-import alias.action.clip.ClipAction;
-import alias.action.script.ScriptAction;
-import message.Message;
-
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlTransient;
-import java.util.concurrent.ScheduledExecutorService;
-
-/**
- * Alias action defines an action to execute when an alias is detected active.
- */
-@XmlSeeAlso( { BeepAction.class, ClipAction.class, ScriptAction.class } )
-@XmlRootElement( name = "action" )
-public abstract class AliasAction
-{
-	public AliasAction()
-	{
-	}
-
-	@XmlTransient
-	public abstract AliasActionType getType();
-	
-	/**
-	 * Task to execute when an alias action is defined.  The message argument is
-	 * the original message containing one or more aliases that have an alias
-	 * action attached.  The alias argument is the parent alias containing the
-	 * alias action.
-	 */
-	public abstract void execute( ScheduledExecutorService scheduledExecutorService, Alias alias, Message message );
-
-	/**
-	 * Dismiss a persistent alias action
-	 */
-	public abstract void dismiss( boolean reset );
-}

src/alias/action/beep/BeepAction.java

@@ -1,28 +0,0 @@
-package alias.action.beep;
-
-import message.Message;
-import alias.Alias;
-import alias.action.AliasActionType;
-import alias.action.RecurringAction;
-
-public class BeepAction extends RecurringAction
-{
-
-	@Override
-	public AliasActionType getType()
-	{
-		return AliasActionType.BEEP;
-	}
-
-	@Override
-	public void performAction( Alias alias, Message message )
-	{
-		System.out.println( "\007" );
-	}
-
-	@Override
-	public String toString()
-	{
-		return "Beep";
-	}
-}

src/alias/action/clip/ClipAction.java

@@ -1,110 +0,0 @@
-package alias.action.clip;
-
-import java.io.File;
-
-import javax.sound.sampled.AudioInputStream;
-import javax.sound.sampled.AudioSystem;
-import javax.sound.sampled.Clip;
-import javax.xml.bind.annotation.XmlTransient;
-
-import message.Message;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import alias.Alias;
-import alias.action.AliasActionType;
-import alias.action.RecurringAction;
-
-public class ClipAction extends RecurringAction
-{
-	private final static Logger mLog = LoggerFactory.getLogger( ClipAction.class );
-
-	private String mFilePath;
-
-	@XmlTransient
-	private Clip mClip;
-	
-	public ClipAction()
-	{
-	}
-	
-	@Override
-	public AliasActionType getType()
-	{
-		return AliasActionType.CLIP;
-	}
-
-	public String getPath()
-	{
-		return mFilePath;
-	}
-	
-	public void setPath( String path )
-	{
-		mFilePath = path;
-	}
-	
-	@Override
-	public void performAction( Alias alias, Message message )
-	{
-		try
-		{
-			play();
-		}
-		catch( Exception e )
-		{
-			mLog.error( "Couldn't play audio clip", e );
-		}
-	}
-	
-	public void play() throws Exception
-	{
-		try
-		{
-			if( mFilePath != null )
-			{
-				if( mClip == null )
-				{
-					mClip = AudioSystem.getClip();
-					
-					AudioInputStream ais = 
-							AudioSystem.getAudioInputStream( new File( mFilePath ) );
-					
-					mClip.open( ais );
-				}
-
-				if( mClip.isRunning() )
-				{
-					mClip.stop();
-				}
-				
-				mClip.setFramePosition( 0 );
-				
-				mClip.start();
-			}
-		}
-		catch( Exception e )
-		{
-			mClip = null;
-
-			mLog.error( "Error playing sound clip [" + mFilePath + "] - " + e.getMessage() );
-			
-			throw e;
-		}
-	}
-	
-
-	@Override
-	public String toString()
-	{
-		if( mFilePath == null )
-		{
-			return "Play Clip";
-		}
-		else
-		{
-			return "Play Clip: " + mFilePath;
-		}
-	}
-}

src/alias/action/script/ScriptAction.java

@@ -1,98 +0,0 @@
-package alias.action.script;
-
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-
-import message.Message;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import alias.Alias;
-import alias.action.AliasActionType;
-import alias.action.RecurringAction;
-
-public class ScriptAction extends RecurringAction
-{
-	private final static Logger mLog = LoggerFactory.getLogger( ScriptAction.class );
-
-	private String mScript;
-
-	public ScriptAction()
-	{
-	}
-	
-	@Override
-	public AliasActionType getType()
-	{
-		return AliasActionType.SCRIPT;
-	}
-
-	public String getScript()
-	{
-		return mScript;
-	}
-	
-	public void setScript( String script )
-	{
-		mScript = script;
-	}
-	
-	@Override
-	public void performAction( Alias alias, Message message )
-	{
-		try
-		{
-			play();
-		}
-		catch( Exception e )
-		{
-			mLog.error( "Couldn't execute script [" + mScript + "]", e );
-		}
-	}
-	
-	public void play() throws Exception
-	{
-		if( mScript != null )
-		{
-			ProcessBuilder pb = new ProcessBuilder( mScript );
-			
-			pb.redirectErrorStream( true );
-
-			Process p = pb.start();
-			
-			int exitCode = p.waitFor();
-			
-			BufferedReader reader = new BufferedReader( 
-					new InputStreamReader( p.getInputStream() ) );
-
-            String line = "";			
-
-            StringBuilder sb = new StringBuilder();
-            
-            while( ( line = reader.readLine() ) != null ) 
-            {
-            	sb.append(line + "\n");
-            }
-            
-            if( exitCode != 0 )
-            {
-            	throw new RuntimeException( "Exit Code: " + exitCode + 
-            			" Console:" + sb.toString() );
-            }
-		}
-	}
-	
-	@Override
-	public String toString()
-	{
-		if( mScript == null )
-		{
-			return "Run Script";
-		}
-		else
-		{
-			return "Run Script: " + mScript;
-		}
-	}
-}

src/alias/id/AliasID.java

@@ -1,57 +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.id;
-
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlTransient;
-
-import alias.id.broadcast.BroadcastChannel;
-import playlist.version1.Group;
-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.nonrecordable.NonRecordable;
-import alias.id.priority.Priority;
-import alias.id.siteID.SiteID;
-import alias.id.status.StatusID;
-import alias.id.talkgroup.TalkgroupID;
-import alias.id.uniqueID.UniqueID;
-
-@SuppressWarnings( "deprecation" )
-@XmlSeeAlso( {BroadcastChannel.class, Esn.class, FleetsyncID.class, Group.class, LoJackFunctionAndID.class,
-			   MDC1200ID.class, Min.class, MPT1327ID.class, NonRecordable.class,
-			   Priority.class, SiteID.class, StatusID.class, TalkgroupID.class,
-			   UniqueID.class } )
-@XmlRootElement( name = "id" )
-public abstract class AliasID
-{
-	public AliasID()
-	{
-	}
-	
-	public abstract AliasIDType getType();
-	
-	public abstract boolean matches( AliasID id );
-
-	@XmlTransient
-	public abstract boolean isValid();
-}

src/alias/id/lojack/LoJackFunctionAndID.java

@@ -1,138 +0,0 @@
-/*******************************************************************************
- *     SDR Trunk 
- *     Copyright (C) 2015 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.id.lojack;
-
-import javax.xml.bind.annotation.XmlAttribute;
-
-import module.decode.lj1200.LJ1200Message;
-import module.decode.lj1200.LJ1200Message.Function;
-import alias.id.AliasID;
-import alias.id.AliasIDType;
-
-public class LoJackFunctionAndID extends AliasID
-{
-	private LJ1200Message.Function mFunction = Function.F0_UNKNOWN;
-	private String mID = "*****";
-	
-	public LoJackFunctionAndID()
-	{
-	}
-
-	@XmlAttribute( name="id" )
-	public String getID()
-	{
-		return mID;
-	}
-
-	public void setID( String id )
-	{
-		mID = id;
-	}
-
-	@XmlAttribute( name="function" )
-	public Function getFunction()
-	{
-		return mFunction;
-	}
-
-	public void setFunction( Function function )
-	{
-		mFunction = function;
-	}
-
-	@Override
-	public boolean isValid()
-	{
-		return mFunction != null && mID != null;
-	}
-
-	public String toString()
-	{
-		return "LoJack FUNC: " + mFunction.getLabel() + " ID:" + ( mID == null ? "" : mID );
-	}
-
-	/**
-	 * Indicates if the function and id combination match this alias id
-	 */
-	public boolean matches( Function function, String id )
-	{
-		return mFunction == function &&
-			   mID != null && 
-			   id != null &&
-			   id.matches( mID.replace( "*", ".?" ) );
-	}
-
-	@Override
-    public boolean matches( AliasID id )
-    {
-		boolean retVal = false;
-		
-		if( mID != null && id instanceof LoJackFunctionAndID )
-		{
-			LoJackFunctionAndID otherLojack = (LoJackFunctionAndID)id;
-
-			if( otherLojack.getFunction() == mFunction )
-			{
-				//Create a pattern - replace * wildcards with regex single-char wildcard
-				String pattern = mID.replace( "*", ".?" );
-				
-				retVal = otherLojack.getID().matches( pattern );
-			}
-		}
-		
-	    return retVal;
-    }
-
-	@Override
-    public AliasIDType getType()
-    {
-	    return AliasIDType.LOJACK;
-    }
-	
-	@Override
-	public int hashCode()
-	{
-		final int prime = 31;
-		int result = 1;
-		result = prime * result
-				+ ( ( mFunction == null ) ? 0 : mFunction.hashCode() );
-		result = prime * result + ( ( mID == null ) ? 0 : mID.hashCode() );
-		return result;
-	}
-
-	@Override
-	public boolean equals( Object obj )
-	{
-		if ( this == obj )
-			return true;
-		if ( obj == null )
-			return false;
-		if ( getClass() != obj.getClass() )
-			return false;
-		LoJackFunctionAndID other = (LoJackFunctionAndID) obj;
-		if ( mFunction != other.mFunction )
-			return false;
-		if ( mID == null )
-		{
-			if ( other.mID != null )
-				return false;
-		} else if ( !mID.equals( other.mID ) )
-			return false;
-		return true;
-	}
-}

src/alias/id/mdc/MDC1200ID.java

@@ -1,79 +0,0 @@
-/*******************************************************************************
- *     SDR Trunk 
- *     Copyright (C) 2014 Dennis Sheirer
- * 
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- * 
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- * 
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>
- ******************************************************************************/
-package alias.id.mdc;
-
-import javax.xml.bind.annotation.XmlAttribute;
-
-import alias.id.AliasID;
-import alias.id.AliasIDType;
-
-
-public class MDC1200ID extends AliasID
-{
-	private String mID;
-	
-	public MDC1200ID()
-	{
-	}
-
-	@XmlAttribute
-	public String getIdent()
-	{
-		return mID;
-	}
-
-	public void setIdent( String ident )
-	{
-		mID = ident;
-	}
-
-	@Override
-	public boolean isValid()
-	{
-		return mID != null;
-	}
-
-	public String toString()
-	{
-		return "MDC-1200: " + mID;
-	}
-
-	@Override
-    public boolean matches( AliasID id )
-    {
-		boolean retVal = false;
-		
-		if( mID != null && id instanceof MDC1200ID )
-		{
-			MDC1200ID tgid = (MDC1200ID)id;
-
-			//Create a pattern - replace * wildcards with regex single-char wildcard
-			String pattern = mID.replace( "*", ".?" );
-			
-			retVal = tgid.getIdent().matches( pattern );
-		}
-		
-	    return retVal;
-    }
-
-	@Override
-    public AliasIDType getType()
-    {
-	    return AliasIDType.MDC1200;
-    }
-}

src/alias/id/mobileID/Min.java

@@ -1,81 +0,0 @@
-/*******************************************************************************
- *     SDR Trunk 
- *     Copyright (C) 2014 Dennis Sheirer
- * 
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- * 
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- * 
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>
- ******************************************************************************/
-package alias.id.mobileID;
-
-import javax.xml.bind.annotation.XmlAttribute;
-
-import alias.id.AliasID;
-import alias.id.AliasIDType;
-
-/**
- * Mobile ID Number
- */
-public class Min extends AliasID
-{
-	private String mMin;
-	
-	public Min()
-	{
-	}
-
-	@XmlAttribute
-	public String getMin()
-	{
-		return mMin;
-	}
-
-	public void setMin( String min )
-	{
-		mMin = min;
-	}
-
-	@Override
-	public boolean isValid()
-	{
-		return mMin != null;
-	}
-
-	public String toString()
-	{
-		return "MIN: " + mMin;
-	}
-
-	@Override
-    public boolean matches( AliasID id )
-    {
-		boolean retVal = false;
-		
-		if( mMin != null && id instanceof Min )
-		{
-			Min min = (Min)id;
-
-			//Create a pattern - replace * wildcards with regex single-char wildcard
-			String pattern = mMin.replace( "*", ".?" );
-			
-			retVal = min.getMin().matches( pattern );
-		}
-		
-	    return retVal;
-    }
-
-	@Override
-    public AliasIDType getType()
-    {
-	    return AliasIDType.MIN;
-    }
-}

src/alias/id/mpt1327/MPT1327ID.java

@@ -1,78 +0,0 @@
-/*******************************************************************************
- *     SDR Trunk 
- *     Copyright (C) 2014 Dennis Sheirer
- * 
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- * 
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- * 
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>
- ******************************************************************************/
-package alias.id.mpt1327;
-
-import javax.xml.bind.annotation.XmlAttribute;
-
-import alias.id.AliasID;
-import alias.id.AliasIDType;
-
-public class MPT1327ID extends AliasID
-{
-	private String mID;
-	
-	public MPT1327ID()
-	{
-	}
-
-	@XmlAttribute
-	public String getIdent()
-	{
-		return mID;
-	}
-
-	public void setIdent( String ident )
-	{
-		mID = ident;
-	}
-
-	@Override
-	public boolean isValid()
-	{
-		return mID != null;
-	}
-
-	public String toString()
-	{
-		return "MPT-1327: " + mID;
-	}
-
-	@Override
-    public boolean matches( AliasID id )
-    {
-		boolean retVal = false;
-		
-		if( mID != null && id instanceof MPT1327ID )
-		{
-			MPT1327ID tgid = (MPT1327ID)id;
-
-			//Create a pattern - replace * wildcards with regex single-char wildcard
-			String pattern = mID.replace( "*", ".?" );
-			
-			retVal = tgid.getIdent().matches( pattern );
-		}
-		
-	    return retVal;
-    }
-
-	@Override
-    public AliasIDType getType()
-    {
-	    return AliasIDType.MPT1327;
-    }
-}

src/alias/id/nonrecordable/NonRecordable.java

@@ -1,31 +0,0 @@
-package alias.id.nonrecordable;
-
-import alias.id.AliasID;
-import alias.id.AliasIDType;
-
-public class NonRecordable extends AliasID
-{
-	@Override
-	public AliasIDType getType()
-	{
-		return AliasIDType.NON_RECORDABLE;
-	}
-
-	@Override
-	public boolean isValid()
-	{
-		return true;
-	}
-
-	@Override
-	public boolean matches( AliasID id )
-	{
-		return false;
-	}
-	
-	@Override
-	public String toString()
-	{
-		return "Audio Non-Recordable";
-	}
-}

src/alias/id/priority/Priority.java

@@ -1,83 +0,0 @@
-/*******************************************************************************
- *     SDR Trunk 
- *     Copyright (C) 2014 Dennis Sheirer
- * 
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- * 
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- * 
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>
- ******************************************************************************/
-package alias.id.priority;
-
-import javax.xml.bind.annotation.XmlAttribute;
-
-import alias.id.AliasID;
-import alias.id.AliasIDType;
-
-/**
- * Specifies an (audio) priority level for this alias.
- */
-public class Priority extends AliasID
-{
-	public static final int DO_NOT_MONITOR = -1;
-	public static final int SELECTED_PRIORITY = 0;
-	public static final int MIN_PRIORITY = 1;
-	public static final int MAX_PRIORITY = 100;
-	public static final int DEFAULT_PRIORITY = 100;
-	
-	private int mPriority = DEFAULT_PRIORITY;
-	
-	public Priority()
-	{
-	}
-
-	@Override
-	public boolean isValid()
-	{
-		return true;
-	}
-
-	/**
-	 * Indicates the associated alias should not be monitored or tracked.
-	 */
-	public boolean isDoNotMonitor()
-	{
-		return mPriority == DO_NOT_MONITOR;
-	}
-
-	@XmlAttribute
-	public int getPriority()
-	{
-		return mPriority;
-	}
-
-	public void setPriority( int priority )
-	{
-		mPriority = priority;
-	}
-	
-	public String toString()
-	{
-		return "Audio Priority: " + ( isDoNotMonitor() ? "Do Not Monitor" : mPriority );
-	}
-
-	@Override
-    public boolean matches( AliasID id )
-    {
-	    return false;
-    }
-
-	@Override
-    public AliasIDType getType()
-    {
-	    return AliasIDType.PRIORITY;
-    }
-}

src/alias/id/siteID/SiteID.java

@@ -1,68 +0,0 @@
-/*******************************************************************************
- *     SDR Trunk 
- *     Copyright (C) 2014 Dennis Sheirer
- * 
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- * 
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- * 
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>
- ******************************************************************************/
-package alias.id.siteID;
-
-import javax.xml.bind.annotation.XmlAttribute;
-
-import alias.id.AliasID;
-import alias.id.AliasIDType;
-
-public class SiteID extends AliasID
-{
-	private String mSite;
-	
-	public SiteID()
-	{
-	}
-
-	@XmlAttribute
-	public String getSite()
-	{
-		return mSite;
-	}
-
-	public void setSite( String site )
-	{
-		mSite = site;
-	}
-
-	@Override
-	public boolean isValid()
-	{
-		return mSite != null;
-	}
-
-	public String toString()
-	{
-		return "Site: " + mSite;
-	}
-
-	@Override
-    public boolean matches( AliasID otherID )
-    {
-		return otherID != null && 
-			   otherID instanceof SiteID && 
-			   getSite().contentEquals( ( (SiteID)otherID).getSite() );
-    }
-
-	@Override
-    public AliasIDType getType()
-    {
-	    return AliasIDType.SITE;
-    }
-}

src/alias/id/status/StatusID.java

@@ -1,75 +0,0 @@
-/*******************************************************************************
- *     SDR Trunk 
- *     Copyright (C) 2014 Dennis Sheirer
- * 
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- * 
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- * 
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>
- ******************************************************************************/
-package alias.id.status;
-
-import javax.xml.bind.annotation.XmlAttribute;
-
-import alias.id.AliasID;
-import alias.id.AliasIDType;
-
-public class StatusID extends AliasID
-{
-	private int mStatus;
-	
-	public StatusID()
-	{
-	}
-
-	@XmlAttribute
-	public int getStatus()
-	{
-		return mStatus;
-	}
-
-	public void setStatus( int status )
-	{
-		this.mStatus = status;
-	}
-
-	@Override
-	public boolean isValid()
-	{
-		return true;
-	}
-
-	public String toString()
-	{
-		return "Status: " + String.format( "%03d", mStatus );
-	}
-
-	@Override
-    public boolean matches( AliasID id )
-    {
-		boolean retVal = false;
-		
-		if( id instanceof StatusID )
-		{
-			StatusID statusId = (StatusID)id;
-			
-			retVal = ( mStatus == statusId.getStatus() );
-		}
-		
-	    return retVal;
-    }
-
-	@Override
-    public AliasIDType getType()
-    {
-	    return AliasIDType.STATUS;
-    }
-}

src/alias/id/uniqueID/UniqueID.java

@@ -1,75 +0,0 @@
-/*******************************************************************************
- *     SDR Trunk 
- *     Copyright (C) 2014 Dennis Sheirer
- * 
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- * 
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- * 
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>
- ******************************************************************************/
-package alias.id.uniqueID;
-
-import javax.xml.bind.annotation.XmlAttribute;
-
-import alias.id.AliasID;
-import alias.id.AliasIDType;
-
-public class UniqueID extends AliasID
-{
-	private int mUid;
-	
-	public UniqueID()
-	{
-	}
-
-	@XmlAttribute
-	public int getUid()
-	{
-		return mUid;
-	}
-
-	public void setUid( int uid )
-	{
-		this.mUid = uid;
-	}
-
-	@Override
-	public boolean isValid()
-	{
-		return true;
-	}
-
-	public String toString()
-	{
-		return "UniqueID: " + mUid;
-	}
-
-	@Override
-    public boolean matches( AliasID id )
-    {
-		boolean retVal = false;
-		
-		if( id instanceof UniqueID )
-		{
-			UniqueID uid = (UniqueID)id;
-			
-			retVal = mUid == uid.getUid();
-		}
-		
-	    return retVal;
-    }
-
-	@Override
-    public AliasIDType getType()
-    {
-	    return AliasIDType.LTR_NET_UID;
-    }
-}

src/buffer/ComplexCircularBuffer.java

@@ -1,90 +0,0 @@
-/*******************************************************************************
- *     SDR Trunk 
- *     Copyright (C) 2014 Dennis Sheirer
- * 
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- * 
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- * 
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>
- ******************************************************************************/
-package buffer;
-
-import java.util.Arrays;
-
-import sample.complex.Complex;
-
-/**
- * Circular sample buffer - allocates a buffer and stores samples in a circular
- * fashion, overwriting older samples with newly arrived samples.  Initially
- * fills buffer with 0-valued samples
- * 
- * Can be used as a delay-type buffer, to delay samples by the 'size' amount
- */
-public class ComplexCircularBuffer
-{
-	Complex[] mBuffer;
-	int mBufferPointer = 0;
-	
-	public ComplexCircularBuffer( int size )
-	{
-		mBuffer = new Complex[ size ];
-		
-		Arrays.fill( mBuffer, new Complex( 1.0f, 1.0f ) );
-	}
-
-	/**
-	 * Returns the sample currently pointed to in the buffer and stores the 
-	 * new sample in its place
-	 * @param sample
-	 * @return
-	 */
-	public Complex get( Complex sample )
-	{
-		Complex retVal = mBuffer[ mBufferPointer ];
-
-		put( sample );
-
-		return retVal;
-	}
-	
-	public void put( Complex sample )
-	{
-		mBuffer[ mBufferPointer ] = sample;
-
-		mBufferPointer++;
-		
-		if( mBufferPointer >= mBuffer.length )
-		{
-			mBufferPointer = 0;
-		}
-	}
-	
-	public Complex[] get( int count )
-	{
-		Complex[] samples = new Complex[ count ];
-		
-		int tempCounter = mBufferPointer;
-
-		for( int x = 0; x < count; x++ )
-		{
-			samples[ x ] = mBuffer[ tempCounter ];
-			
-			tempCounter++;
-			
-			if( tempCounter > mBuffer.length - 1 )
-			{
-				tempCounter = 0;
-			}
-		}
-		
-		return samples;
-	}
-}

src/buffer/DoubleCircularBuffer.java

@@ -1,80 +0,0 @@
-/*******************************************************************************
- *     SDR Trunk 
- *     Copyright (C) 2014 Dennis Sheirer
- * 
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- * 
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- * 
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>
- ******************************************************************************/
-package buffer;
-
-import java.util.Arrays;
-
-/**
- * Circular sample buffer - allocates a buffer and stores samples in a circular
- * fashion, overwriting older samples with newly arrived samples.  Initially
- * fills buffer with 0-valued samples
- * 
- * Can be used as a delay-type buffer, to delay samples by the 'size' amount
- */
-public class DoubleCircularBuffer
-{
-	double[] mBuffer;
-	int mBufferPointer = 0;
-	
-	public DoubleCircularBuffer( int size )
-	{
-		mBuffer = new double[ size ];
-		
-		Arrays.fill( mBuffer, 0.0 );
-	}
-
-	/**
-	 * Puts the new value into the buffer and returns the oldest buffer value
-	 * that it replaced
-	 * @param newValue
-	 * @return
-	 */
-	public double get( double newValue )
-	{
-		double oldestSample = mBuffer[ mBufferPointer ];
-
-		mBuffer[ mBufferPointer ] = newValue;
-		
-		mBufferPointer++;
-		
-		if( mBufferPointer >= mBuffer.length )
-		{
-			mBufferPointer = 0;
-		}
-		
-		return oldestSample;
-	}
-
-	/**
-	 * Returns the maximum from the values currently in the buffer
-	 */
-	public double max()
-	{
-		double max = 0.0d;
-		
-		for( int x = 0; x < mBuffer.length; x++ )
-		{
-			if( mBuffer[ x ] > max )
-			{
-				max = mBuffer[ x ];
-			}
-		}
-		
-		return max;
-	}
-}

src/buffer/FloatCircularBuffer.java

@@ -1,118 +0,0 @@
-/*******************************************************************************
- *     SDR Trunk 
- *     Copyright (C) 2014 Dennis Sheirer
- * 
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- * 
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- * 
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>
- ******************************************************************************/
-package buffer;
-
-import java.util.Arrays;
-
-/**
- * Circular sample buffer - allocates a buffer and stores samples in a circular
- * fashion, overwriting older samples with newly arrived samples.  Initially
- * fills buffer with 0-valued samples
- * 
- * Can be used as a delay-type buffer, to delay samples by the 'size' amount
- * @author denny
- *
- */
-public class FloatCircularBuffer
-{
-	float[] mBuffer;
-	int mBufferPointer = 0;
-	
-	public FloatCircularBuffer( int size )
-	{
-		mBuffer = new float[ size ];
-		
-		Arrays.fill( mBuffer, (float)0.0 );
-	}
-	
-	public int getSize()
-	{
-		return mBuffer.length;
-	}
-	
-	public float[] getBuffer()
-	{
-		return mBuffer;
-	}
-
-	/**
-	 * Puts the new value into the buffer and returns the oldest buffer value
-	 * that it replaced
-	 * @param newValue
-	 * @return
-	 */
-	public float get( float newValue )
-	{
-		float oldestSample = mBuffer[ mBufferPointer ];
-
-		mBuffer[ mBufferPointer ] = newValue;
-		
-		mBufferPointer++;
-		
-		if( mBufferPointer >= mBuffer.length )
-		{
-			mBufferPointer = 0;
-		}
-		
-		return oldestSample;
-	}
-
-	/**
-	 * Convenience method to put a new value in the buffer, while discarding
-	 * the old value
-	 */
-	public void put( float newValue )
-	{
-		get( newValue );
-	}
-
-	/**
-	 * Returns an array of arraySize, loaded with sampleCount of the 
-	 * oldest samples, loaded into the array starting at index 0.
-	 * 
-	 * This is useful for fetching an array filled half way with samples to
-	 * use in FFT processing.
-	 * @param arraySize - size of the array (must be larger than sampleCount)
-	 * @param sampleCount - number of the oldest samples in the buffer to load
-	 * @return
-	 */
-	public float[] get( int arraySize, int sampleCount )
-	{
-		float[] samples = new float[ arraySize ];
-
-		if( arraySize > sampleCount )
-		{
-			int tempCounter = mBufferPointer;
-
-			for( int x = 0; x < sampleCount; x++ )
-			{
-				samples[ x ] = mBuffer[ tempCounter ];
-				
-				tempCounter++;
-				
-				if( tempCounter > mBuffer.length )
-				{
-					tempCounter = 0;
-				}
-			}
-		}
-		
-		return samples;
-	}
-	
-}

src/controller/channel/ChannelEditor.java

@@ -1,257 +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 controller.channel;
-
-import gui.editor.Editor;
-import gui.editor.EditorValidationException;
-
-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.JOptionPane;
-
-import module.decode.AuxDecodeConfigurationEditor;
-import module.decode.DecodeConfigurationEditor;
-import module.log.EventLogConfigurationEditor;
-import net.miginfocom.swing.MigLayout;
-import record.RecordConfigurationEditor;
-import source.SourceConfigurationEditor;
-import source.SourceManager;
-import alias.AliasModel;
-
-import com.jidesoft.swing.JideTabbedPane;
-
-import controller.channel.ChannelEvent.Event;
-import controller.channel.map.ChannelMapModel;
-
-public class ChannelEditor extends Editor<Channel> implements ActionListener, ChannelEventListener
-{
-	private static final long serialVersionUID = 1L;
-
-	private NameConfigurationEditor mNameConfigurationEditor;
-    private SourceConfigurationEditor mSourceConfigurationEditor;
-    private DecodeConfigurationEditor mDecodeConfigurationEditor;
-    private AuxDecodeConfigurationEditor mAuxDecodeConfigurationEditor;
-    private EventLogConfigurationEditor mEventLogConfigurationEditor;
-    private RecordConfigurationEditor mRecordConfigurationEditor;
-    
-	private JButton mEnableButton = new JButton( "Enable" );
-	private JLabel mChannelName = new JLabel( "Channel:" );
-    
-	private ChannelModel mChannelModel;
-	private ChannelMapModel mChannelMapModel;
-    private SourceManager mSourceManager;
-    
-    private boolean mChannelEnableRequested = false;
-    
-	public ChannelEditor( ChannelModel channelModel,
-						  ChannelMapModel channelMapModel,
-						  SourceManager sourceManager,
-						  AliasModel aliasModel )
-	{
-		mChannelModel = channelModel;
-		mChannelMapModel = channelMapModel;
-		mSourceManager = sourceManager;
-		mNameConfigurationEditor = new NameConfigurationEditor( aliasModel,	mChannelModel );
-		
-		init();
-	}
-	
-	private void init()
-	{
-		setLayout( new MigLayout( "fill,wrap 3", "[grow,fill][grow,fill][grow,fill]", "[grow,fill][]" ) );
-		
-		JideTabbedPane tabs = new JideTabbedPane();
-		tabs.setFont( this.getFont() );
-    	tabs.setForeground( Color.BLACK );
-
-    	tabs.setTabTrailingComponent( mChannelName );
-    	
-		mNameConfigurationEditor.setSaveRequestListener( this );
-    	tabs.addTab( "Name/Alias", mNameConfigurationEditor );
-    	
-		mSourceConfigurationEditor = new SourceConfigurationEditor( mSourceManager );
-		mSourceConfigurationEditor.setSaveRequestListener( this );
-		tabs.addTab( "Source", mSourceConfigurationEditor );
-		
-		mDecodeConfigurationEditor = new DecodeConfigurationEditor( mChannelMapModel );
-		mDecodeConfigurationEditor.setSaveRequestListener( this );
-		tabs.addTab( "Decoder", mDecodeConfigurationEditor );
-
-		mAuxDecodeConfigurationEditor = new AuxDecodeConfigurationEditor();
-		mAuxDecodeConfigurationEditor.setSaveRequestListener( this );
-		tabs.addTab( "Aux Decoders", mAuxDecodeConfigurationEditor );
-
-		mEventLogConfigurationEditor = new EventLogConfigurationEditor();
-		mEventLogConfigurationEditor.setSaveRequestListener( this );
-		tabs.addTab( "Logging", mEventLogConfigurationEditor );
-		
-		mRecordConfigurationEditor = new RecordConfigurationEditor();
-		mRecordConfigurationEditor.setSaveRequestListener( this );
-		tabs.addTab( "Recording", mRecordConfigurationEditor );
-
-		add( tabs, "span" );
-
-		mEnableButton.addActionListener( this );
-		mEnableButton.setEnabled( false );
-		mEnableButton.setToolTipText( "Start the currently selected channel running/decoding" );
-		add( mEnableButton );
-
-		JButton btnSave = new JButton( "Save" );
-		btnSave.setToolTipText( "Save changes to the currently selected channel" );
-		btnSave.addActionListener( ChannelEditor.this );
-		add( btnSave );
-
-		JButton btnReset = new JButton( "Reset" );
-		btnReset.setToolTipText( "Reload the currently selected channel" );
-		btnReset.addActionListener( ChannelEditor.this );
-		add( btnReset );
-	}
-
-	@Override
-	public void channelChanged( ChannelEvent event )
-	{
-		if( hasItem() && getItem() == event.getChannel() )
-		{
-			switch( event.getEvent() )
-			{
-				case NOTIFICATION_CONFIGURATION_CHANGE:
-				case NOTIFICATION_PROCESSING_START:
-				case NOTIFICATION_PROCESSING_STOP:
-					setItem( getItem() );
-					mChannelEnableRequested = false;
-					break;
-				case NOTIFICATION_DELETE:
-					setItem( null );
-					break;
-				case NOTIFICATION_ENABLE_REJECTED:
-					if( mChannelEnableRequested )
-					{
-						JOptionPane.showMessageDialog( ChannelEditor.this, "Channel could not be "
-							+ "enabled.  This is likely because there are no tuner channels "
-							+ "available", "Couldn't enable channel", JOptionPane.INFORMATION_MESSAGE );
-							
-						mChannelEnableRequested = false;
-					}
-					break;
-				default:
-					break;
-			}
-		}
-	}
-
-	@Override
-    public void actionPerformed( ActionEvent e )
-    {
-		String command = e.getActionCommand();
-		
-		if( command.contentEquals( "Enable" ) )
-		{
-			if( hasItem() )
-			{
-				save();
-				
-				mChannelEnableRequested = true;
-				mChannelModel.broadcast( new ChannelEvent( getItem(), Event.REQUEST_ENABLE ) );
-			}
-		}
-		else if( command.contentEquals( "Disable" ) )
-		{
-			if( hasItem() )
-			{
-				mChannelModel.broadcast( new ChannelEvent( getItem(), Event.REQUEST_DISABLE ) );
-			}
-		}
-		else if( command.contentEquals( "Save" ) )
-		{
-			save();
-		}
-		else if( command.contentEquals( "Reset" ) )
-		{
-			setItem( getItem() );
-		}
-    }
-
-	/**
-	 * Sets the channel configuration in each of the channel editor components
-	 * Note: this method must be invoked on the swing event dispatch thread
-	 */
-	public void setItem( final Channel channel )
-	{
-		super.setItem( channel );
-		
-		mNameConfigurationEditor.setItem( channel );
-		mSourceConfigurationEditor.setItem( channel );
-		mDecodeConfigurationEditor.setItem( channel );
-		mAuxDecodeConfigurationEditor.setItem( channel );
-		mEventLogConfigurationEditor.setItem( channel );
-		mRecordConfigurationEditor.setItem( channel );
-		
-		if( channel != null )
-		{
-			mChannelName.setText( "Channel: " + channel.getName() );
-			mEnableButton.setText( channel.getEnabled() ? "Disable" : "Enable" );
-			mEnableButton.setEnabled( true );
-			mEnableButton.setBackground( channel.getEnabled() ? Color.GREEN : getBackground() );
-		}
-		else
-		{
-			mChannelName.setText( "Channel: " );
-			mEnableButton.setText( "Enable" );
-			mEnableButton.setEnabled( false );
-			mEnableButton.setBackground( getBackground() );
-		}
-	}
-	
-    public void save()
-    {
-    	if( hasItem() )
-    	{
-			mNameConfigurationEditor.save();
-   			mSourceConfigurationEditor.save();
-   			mDecodeConfigurationEditor.save();
-   			mAuxDecodeConfigurationEditor.save();
-   			mEventLogConfigurationEditor.save();
-   			mRecordConfigurationEditor.save();
-   			
-    		try
-    		{
-    			mDecodeConfigurationEditor.validate( mSourceConfigurationEditor );
-    			mDecodeConfigurationEditor.validate( mAuxDecodeConfigurationEditor );
-    		}
-    		catch( EditorValidationException e )
-    		{
-    			e.getEditor().requestFocus();
-    			
-    			JOptionPane.showMessageDialog( e.getEditor(), e.getReason(),
-    					"Configuration Error", JOptionPane.ERROR_MESSAGE );			
-    			
-    			return;
-    		}
-    		
-
-   			mChannelModel.broadcast( new ChannelEvent( getItem(), 
-   	   					Event.NOTIFICATION_CONFIGURATION_CHANGE ) );
-    	}
-
-    	setModified( false );
-    }
-}

src/controller/channel/map/ChannelMap.java

@@ -1,145 +0,0 @@
-/*******************************************************************************
- *     SDR Trunk 
- *     Copyright (C) 2014 Dennis Sheirer
- * 
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- * 
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- * 
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>
- ******************************************************************************/
-package controller.channel.map;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlTransient;
-
-@XmlSeeAlso( { ChannelRange.class } )
-public class ChannelMap
-{
-	private String mName;
-	private boolean mInvalid = false;
-	
-	private List<ChannelRange> mRanges = new ArrayList<ChannelRange>();
-	
-	public ChannelMap()
-	{
-		this( "New Channel Map" );
-	}
-	
-	public ChannelMap( String name )
-	{
-		mName = name;
-	}
-	
-	public ChannelMap copyOf()
-	{
-		ChannelMap map = new ChannelMap( new String( mName ) );
-		
-		for( ChannelRange range: mRanges )
-		{
-			map.addRange( range.copyOf() );
-		}
-		
-		return map;
-	}
-
-	@XmlTransient
-	public boolean isInvalid()
-	{
-		return mInvalid;
-	}
-
-	public String toString()
-	{
-		return mName + ( mInvalid ? " - Error" : "" );
-	}
-	
-	@XmlElement( name = "range" )
-	public List<ChannelRange> getRanges()
-	{
-		return mRanges;
-	}
-
-	public void setRanges( List<ChannelRange> ranges )
-	{
-		mRanges = ranges;
-		
-		validate();
-	}
-	
-	@XmlAttribute
-	public String getName()
-	{
-		return mName;
-	}
-	
-	public void setName( String name )
-	{
-		mName = name;
-	}
-	
-	public long getFrequency( int channelNumber )
-	{
-		for( ChannelRange range: mRanges )
-		{
-			if( range.hasChannel( channelNumber ) )
-			{
-				return range.getFrequency( channelNumber );
-			}
-		}
-		
-		return 0;
-	}
-
-	/**
-	 * Validates each of the channel ranges for overlap
-	 */
-	private void validate()
-	{
-		mInvalid = false;
-		
-		for( int x = 0; x < mRanges.size(); x++ )
-		{
-			if( !mRanges.get( x ).isValid() )
-			{
-				mInvalid = true;
-			}
-			
-			for( int y = x + 1; y <  mRanges.size(); y++ )
-			{
-				if( mRanges.get( x ).overlaps( mRanges.get( y ) ) )
-				{
-					mInvalid = true;
-				}
-			}
-		}
-	}
-	
-	
-	public void addRange( ChannelRange range )
-	{
-		mRanges.add( range );
-		
-		validate();
-	}
-	
-	public void removeRange( ChannelRange range )
-	{
-		mRanges.remove( range );
-		
-		validate();
-	}
-
-}

src/controller/channel/map/ChannelRange.java

@@ -1,186 +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 controller.channel.map;
-
-import java.text.DecimalFormat;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlTransient;
-import javax.xml.bind.annotation.XmlType;
-
-@XmlRootElement
-@XmlType( name = "range" )
-public class ChannelRange
-{
-	private static final DecimalFormat FREQUENCY_FORMATTER = new DecimalFormat( "#.0000" ); 
-
-	private int mFirst = 1;
-	private int mLast = 1023;
-	private int mBase = 450000000;
-	private int mSize = 12500;
-	
-	private boolean mOverlapping = false;
-
-	public ChannelRange() 
-	{
-	}
-	
-	public ChannelRange( int first, int last, int base, int size )
-	{
-		mFirst = first;
-		mLast = last;
-		mBase = base;
-		mSize = size;
-	}
-
-	public ChannelRange copyOf()
-	{
-		return new ChannelRange( mFirst, mLast, mBase, mSize );
-	}
-	
-	public String getDescription()
-	{
-		StringBuilder sb = new StringBuilder();
-		
-		if( isValid() )
-		{
-			sb.append( "First: " );
-			sb.append( mFirst + "=" );
-			
-			long frequency = getFrequency( mFirst );
-			
-			sb.append( FREQUENCY_FORMATTER.format( (double)frequency / 1E6D ) );
-			sb.append( "  Last: " );
-			sb.append( mLast + "=" );
-			
-			frequency = getFrequency( mLast );
-			sb.append( FREQUENCY_FORMATTER.format( (double)frequency / 1E6D ) );
-			sb.append( " MHz" );
-		}
-		else
-		{
-			sb.append( "First channel must be smaller than last channel" );
-		}
-		
-		if( isOverlapping() )
-		{
-			if( sb.length() > 0 )
-			{
-				sb.append( ", " );
-			}
-			
-			sb.append( "Overlap!" );
-		}
-
-		return sb.toString();
-	}
-	
-	public boolean isValid()
-	{
-		return mFirst < mLast;
-	}
-	
-	public boolean overlaps( ChannelRange other )
-	{
-		return ( mFirst <= other.mFirst && other.mFirst <= mLast ) ||
-			   ( mFirst <= other.mLast && other.mLast <= mLast ) ||
-			   ( mFirst <= other.mFirst && other.mLast <= mLast ) ||
-			   ( other.mFirst <= mFirst && mLast <= other.mLast );
-	}
-
-	@XmlTransient
-	public boolean isOverlapping()
-	{
-		return mOverlapping;
-	}
-	
-	public void setOverlapping( boolean overlapping )
-	{
-		mOverlapping = overlapping;
-	}
-	
-	public boolean hasChannel( int channel )
-	{
-		return mFirst <= channel && channel <= mLast;
-	}
-	
-	public long getFrequency( int channel )
-	{
-		if( hasChannel( channel ) )
-		{
-			return mBase + ( ( channel - mFirst ) * mSize );
-		}
-		else
-		{
-			return 0;
-		}
-	}
-	
-	@XmlAttribute( name = "first" )
-	public int getFirstChannelNumber()
-	{
-		return mFirst;
-	}
-	
-	public void setFirstChannelNumber( int first )
-	{
-		mFirst = first;
-	}
-
-	@XmlAttribute( name = "last" )
-	public void setLastChannelNumber( int last )
-	{
-		mLast = last;
-	}
-	
-	public int getLastChannelNumber()
-	{
-		return mLast;
-	}
-
-	/**
-	 * Sets the base frequency
-	 * @param base frequency in hertz
-	 */
-	@XmlAttribute( name = "base" )
-	public void setBase( int base )
-	{
-		mBase = base;
-	}
-	
-	public int getBase()
-	{
-		return mBase;
-	}
-
-	/**
-	 * Sets the channel size 
-	 * @param size in hertz
-	 */
-	@XmlAttribute( name = "size" )
-	public void setSize( int size )
-	{
-		mSize = size;
-	}
-	
-	public int getSize()
-	{
-		return mSize;
-	}
-}

src/controller/config/Configuration.java

@@ -1,40 +0,0 @@
-/*******************************************************************************
- *     SDR Trunk 
- *     Copyright (C) 2014 Dennis Sheirer
- * 
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- * 
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- * 
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>
- ******************************************************************************/
-package controller.config;
-
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSeeAlso;
-
-import module.decode.config.AuxDecodeConfiguration;
-import module.decode.config.DecodeConfiguration;
-import module.log.config.EventLogConfiguration;
-import record.config.RecordConfiguration;
-import source.config.SourceConfiguration;
-
-@XmlSeeAlso( { AuxDecodeConfiguration.class,
-			   DecodeConfiguration.class,
-			   EventLogConfiguration.class,
-			   RecordConfiguration.class,
-			   SourceConfiguration.class } )
-@XmlRootElement( name = "configuration" )
-public abstract class Configuration
-{
-	public Configuration()
-	{
-	}
-}

src/dsp/filter/design/FilterView.java

@@ -1,171 +0,0 @@
-package dsp.filter.design;
-
-import org.jtransforms.fft.FloatFFT_1D;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import dsp.filter.FilterFactory;
-import dsp.filter.Window.WindowType;
-import dsp.filter.fir.FIRFilterSpecification;
-import dsp.filter.fir.remez.RemezFIRFilterDesigner;
-import gui.control.CurveFittedAreaChart;
-import javafx.collections.ObservableList;
-import javafx.scene.chart.NumberAxis;
-import javafx.scene.chart.XYChart;
-import javafx.scene.chart.XYChart.Series;
-import javafx.scene.layout.BorderPane;
-import javafx.scene.layout.HBox;
-import javafx.scene.layout.Priority;
-
-public class FilterView extends BorderPane
-{
-	private final static Logger mLog = LoggerFactory.getLogger( FilterView.class );
-
-	private CurveFittedAreaChart mImpulseChart;
-	private NumberAxis mImpulseXAxis;
-	private NumberAxis mImpulseYAxis;
-	private CurveFittedAreaChart mDFTChart;
-	private NumberAxis mDFTXAxis;
-	private NumberAxis mDFTYAxis;
-	private static final int FFT_SIZE = 4096;
-	private FloatFFT_1D mFFT = new FloatFFT_1D( FFT_SIZE );
-	
-	public FilterView( float[] taps )
-	{
-		init();
-
-		if( taps != null )
-		{
-			setImpulseTaps( taps );
-
-			float[] dft = new float[ FFT_SIZE ];
-			System.arraycopy( taps, 0, dft, 0, taps.length );
-			
-			mFFT.realForward( dft );
-			
-			setDFTTaps( convertDFTToDecibel( dft, taps.length ) );
-		}
-	}
-	
-	private void init()
-	{
-		HBox hbox = new HBox();
-		
-		mImpulseXAxis = new NumberAxis( 0.0, 0.5, 1.0 );
-		mImpulseYAxis = new NumberAxis( -0.2, 1.2, .1 );
-		
-		mImpulseChart = new CurveFittedAreaChart( mImpulseXAxis, mImpulseYAxis );
-		mImpulseChart.setLegendVisible( false );
-		mImpulseChart.setHorizontalGridLinesVisible( false );
-		mImpulseChart.setVerticalGridLinesVisible(false);
-        mImpulseChart.setAlternativeColumnFillVisible(false);
-        mImpulseChart.setAlternativeRowFillVisible(false);
-        
-        String css = FilterView.class.getResource( "FilterView.css" ).toExternalForm();
-        mImpulseChart.getStylesheets().add( css );
-
-        hbox.getChildren().add( mImpulseChart );
-        HBox.setHgrow( mImpulseChart, Priority.ALWAYS );
-        
-		mDFTXAxis = new NumberAxis( 0.0, FFT_SIZE / 2, FFT_SIZE / 8 );
-		mDFTYAxis = new NumberAxis( -200.0, 10.0, 10.0 );
-		
-		mDFTChart = new CurveFittedAreaChart( mDFTXAxis, mDFTYAxis );
-		mDFTChart.setLegendVisible( false );
-		mDFTChart.setHorizontalGridLinesVisible( false );
-		mDFTChart.setVerticalGridLinesVisible(false);
-        mDFTChart.setAlternativeColumnFillVisible(false);
-        mDFTChart.setAlternativeRowFillVisible(false);
-        mDFTChart.getStylesheets().add( css );
-        
-        hbox.getChildren().add( mDFTChart );
-        HBox.setHgrow( mDFTChart, Priority.ALWAYS );
-
-        setCenter( hbox );
-	}
-	
-	public void setImpulseTaps( double[] taps )
-	{
-		float[] convertedTaps = new float[ taps.length ];
-		
-		for( int x = 0; x < taps.length; x++ )
-		{
-			convertedTaps[ x ] = (float)taps[ x ];
-		}
-		
-		setImpulseTaps( convertedTaps );
-	}
-	
-	public void setImpulseTaps( float[] taps )
-	{
-		double smallest = 0.0;
-		double largest = 0.0;
-		
-        final XYChart.Series<Number, Number> series = new XYChart.Series<>();
-        
-        for( int x = 0; x < taps.length; x++ )
-        {
-        	if( taps[ x ] < smallest )
-			{
-        		smallest = taps[ x ];
-			}
-        	
-        	if( taps[ x ] > largest )
-        	{
-        		largest = taps[ x ];
-        	}
-
-        	series.getData().add( new XYChart.Data<Number, Number>( x, taps[ x ] ) );
-        }
-        
-        mImpulseXAxis.setLowerBound( 0.0 );
-        mImpulseXAxis.setUpperBound( taps.length - 1 );
-        mImpulseXAxis.setTickUnit( 1.0 );
-        
-        double padding = Math.abs( largest - smallest ) * .1;
-        
-        mImpulseYAxis.setLowerBound( smallest - padding );
-        mImpulseYAxis.setUpperBound( largest + padding );
-        mImpulseYAxis.setTickUnit( padding );
-
-        ObservableList<Series<Number,Number>> list = mImpulseChart.getData();
-        list.add( series );
-	}
-	
-	public void setDFTTaps( float[] taps )
-	{
-		double smallest = 0.0;
-		
-        final XYChart.Series<Number, Number> series = new XYChart.Series<>();
-        
-        for( int x = 0; x < taps.length; x++ )
-        {
-        	if( taps[ x ] < smallest )
-			{
-        		smallest = taps[ x ];
-			}
-        	
-        	series.getData().add( new XYChart.Data<Number, Number>( x, taps[ x ] ) );
-        }
-        
-        ObservableList<Series<Number,Number>> list = mDFTChart.getData();
-        list.add( series );
-	}
-	
-    public float[] convertDFTToDecibel( float[] dft, int tapLength )
-    {
-		float[] decibels = new float[ dft.length / 2 ];
-
-		int index = 0;
-		
-		for( int x = 0; x < decibels.length; x ++ )
-		{
-			index = x * 2;
-			
-			decibels[ x ] = 20.0f * (float)Math.log10( ( ( dft[ index ] * dft[ index ] ) + 
-				  ( dft[ index + 1 ] * dft[ index + 1 ] ) ) );
-		}
-
-		return decibels;
-    }
-}

src/dsp/filter/fir/complex/ComplexFIRFilter.java

@@ -1,54 +0,0 @@
-package dsp.filter.fir.complex;
-
-import sample.complex.Complex;
-import dsp.filter.fir.FIRFilter;
-import dsp.filter.fir.real.RealFIRFilter;
-
-public class ComplexFIRFilter extends FIRFilter
-{
-	private RealFIRFilter mIFilter;
-	private RealFIRFilter mQFilter;
-	
-	/**
-	 * Complex FIR Filter for processing complex sample pairs.  Wraps two real 
-	 * FIR filters for processing each of the inphase and quadrature samples.
-	 * 
-	 * @param coefficients - filter taps
-	 * @param gain - gain to apply to filtered outputs - use 1.0f for no gain
-	 */
-	public ComplexFIRFilter( float[] coefficients, float gain )
-	{
-		mIFilter = new RealFIRFilter( coefficients, gain );
-		mQFilter = new RealFIRFilter( coefficients, gain );
-	}
-	
-	public float[] getCoefficients()
-	{
-		return mIFilter.getCoefficients();
-	}
-	
-	public float filterInphase( float sample )
-	{
-		return mIFilter.filter( sample );
-	}
-	
-	public float filterQuadrature( float sample )
-	{
-		return mQFilter.filter( sample );
-	}
-	
-	public Complex filter( Complex sample )
-	{
-		float i = filterInphase( sample.inphase() );
-		float q = filterQuadrature( sample.quadrature() );
-		
-		return new Complex( i, q );
-	}
-	
-	@Override
-	public void dispose()
-	{
-		mIFilter.dispose();
-		mQFilter.dispose();
-	}
-}

src/dsp/filter/interpolator/RealInterpolator.java

@@ -1,59 +0,0 @@
-package dsp.filter.interpolator;
-
-import org.apache.commons.lang3.Validate;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import sample.complex.Complex;
-
-public class RealInterpolator extends Interpolator
-{
-	private final static Logger mLog = LoggerFactory.getLogger( RealInterpolator.class );
-
-	private float mGain;
-	
-	public RealInterpolator( float gain )
-	{
-		mGain = gain;
-	}
-	/**
-	 * Calculates an interpolated value from the 8 samples beginning at the 
-	 * offset index.  Uses the mu value to determine which of 128 filter kernels
-	 * to use in order to closely approximate the ideal frequency response for 
-	 * the value of mu, ranging from 0.0 to 1.0, indicating the interpolated
-	 * position in the sample set ranging from offset to offset + 7.
-	 * 
-	 * @param samples - sample array of length at least offset + 7
-	 * 
-	 * @param mu - interpolated sample position between 0 and 1.0 
-	 * 
-	 * @return - interpolated sample value
-	 */
-	public float filter( float[] samples, int offset, float mu )
-	{
-		/* Ensure we have enough samples in the array */
-		Validate.isTrue(samples.length >= offset + 7);
-
-		/* Identify the filter bank that corresponds to mu */
-		int index = (int)( NSTEPS * mu );
-		
-		float accumulator = ( TAPS[ index ][ 7 ] * samples[ offset ] );
-		accumulator += ( TAPS[ index ][ 6 ] * samples[ offset + 1 ] );
-		accumulator += ( TAPS[ index ][ 5 ] * samples[ offset + 2 ] );
-		accumulator += ( TAPS[ index ][ 4 ] * samples[ offset + 3 ] );
-		accumulator += ( TAPS[ index ][ 3 ] * samples[ offset + 4 ] );
-		accumulator += ( TAPS[ index ][ 2 ] * samples[ offset + 5 ] );
-		accumulator += ( TAPS[ index ][ 1 ] * samples[ offset + 6 ] );
-		accumulator += ( TAPS[ index ][ 0 ] * samples[ offset + 7 ] );
-		
-		return accumulator * mGain;
-	}
-	
-	public Complex filter( float[] iSamples, float[] qSamples, int offset, float mu )
-	{
-		float i = filter( iSamples, offset, mu );
-		float q = filter( qSamples, offset, mu );
-		
-		return new Complex( i, q );
-	}
-}

src/dsp/fm/FMDemodulator.java

@@ -1,78 +0,0 @@
-/*******************************************************************************
- *     SDR Trunk 
- *     Copyright (C) 2014,2015 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 dsp.fm;
-
-public abstract class FMDemodulator
-{
-	private float mPreviousI = 0.0f;
-	private float mPreviousQ = 0.0f;
-	protected float mGain;
-
-	public FMDemodulator( float gain )
-	{
-		mGain = gain;
-	}
-
-	public float demodulate( float currentI, float currentQ )
-	{
-		/**
-		 * Multiply the current sample against the complex conjugate of the 
-		 * previous sample to derive the phase delta between the two samples
-		 * 
-		 * Negating the previous sample quadrature produces the conjugate
-		 */
-		double inphase = ( currentI * mPreviousI ) - ( currentQ * -mPreviousQ );
-		double quadrature = ( currentQ * mPreviousI ) + ( currentI * -mPreviousQ );
-	
-		double angle = 0.0f;
-	
-		//Check for divide by zero
-		if( inphase != 0 )
-		{
-			/**
-			 * Use the arc-tangent of quadrature divided by inphase to
-			 * get the phase angle (+/-) which was directly manipulated by the
-			 * original message waveform during the modulation.  This value now
-			 * serves as the instantaneous amplitude of the demodulated signal
-			 */
-			double denominator = 1.0d / inphase;
-			angle = Math.atan( (double)quadrature * denominator );
-		}
-	
-		/**
-		 * Store the current sample to use during the next iteration
-		 */
-		mPreviousI = currentI;
-		mPreviousQ = currentQ;
-	
-		return (float)( angle * mGain );
-	}
-
-	public abstract void dispose();
-
-	public void reset()
-	{
-		mPreviousI = 0.0f;
-		mPreviousQ = 0.0f;
-	}
-
-	public void setGain( float gain )
-	{
-		mGain = gain;
-	}
-}

src/dsp/gain/ComplexFeedForwardGainControl.java

@@ -1,112 +0,0 @@
-package dsp.gain;
-
-import sample.complex.Complex;
-import sample.complex.ComplexSampleListener;
-import buffer.FloatCircularBuffer;
-
-/*******************************************************************************
- *     SDR Trunk 
- *     Copyright (C) 2015 Dennis Sheirer
- * 
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- * 
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- * 
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>
- *     
- *     This class is modeled using concepts detailed in the GNURadio 
- *     implementation of feed forward AGC class located at:
- *     https://github.com/gnuradio/gnuradio/blob/master/gr-analog/lib/
- *     feedforward_agc_cc_impl.cc
- *     
- ******************************************************************************/
-public class ComplexFeedForwardGainControl implements ComplexSampleListener
-{
-	public static final float OBJECTIVE_ENVELOPE = 1.0f;
-	public static final float MINIMUM_ENVELOPE = 0.0001f;
-
-	private ComplexSampleListener mListener;
-
-	private FloatCircularBuffer mEnvelopeHistory;
-	
-	private float mMaxEnvelope = 0.0f;
-	private float mGain = 1.0f;
-	
-	/**
-	 * Dynamic gain control for incoming sample stream to amplify or attenuate
-	 * all samples toward an objective unity)gain, using the maximum envelope 
-	 * value detected in the stream history window.  
-	 * 
-	 * Uses the specified damping factor to limit gain swings.  Damping factor
-	 * is applied against the delta between current gain value and a recalculated
-	 * gain value to limit how quickly the gain value will increase or decrease.
-	 * 
-	 * @param window - history size to use in detecting maximum envelope value
-	 * @param damping - a value between 0 < damping <= 1.0;
-	 */
-	public ComplexFeedForwardGainControl( int window )
-	{
-		mEnvelopeHistory = new FloatCircularBuffer( window );
-	}
-	
-	public void dispose()
-	{
-		mListener = null;
-	}
-
-	@Override
-	public void receive( float inphase, float quadrature )
-	{
-		float envelope = Complex.envelope( inphase, quadrature );
-
-		if( envelope > mMaxEnvelope )
-		{
-			mMaxEnvelope = envelope;
-			
-			adjustGain();
-		}
-
-		/* Replace oldest envelope value with current envelope value */
-		float oldestEnvelope = mEnvelopeHistory.get( envelope );
-
-		/* If the oldest envelope value was the max envelope value, then we 
-		 * have to rediscover the max value from the envelope history */
-		if( mMaxEnvelope == oldestEnvelope && mMaxEnvelope != envelope )
-		{
-			mMaxEnvelope = MINIMUM_ENVELOPE;
-			
-			for( float value: mEnvelopeHistory.getBuffer() )
-			{
-				if( value > mMaxEnvelope )
-				{
-					mMaxEnvelope = value;
-				}
-			}
-			
-			adjustGain();
-		}
-		
-		/* Apply current gain value to the sample and send to the listener */
-		if( mListener != null )
-		{
-			mListener.receive( inphase *= mGain, quadrature *= mGain );
-		}
-	}
-	
-	private void adjustGain()
-	{
-		mGain = OBJECTIVE_ENVELOPE / mMaxEnvelope;
-	}
-
-	public void setListener( ComplexSampleListener listener )
-	{
-		mListener = listener;
-	}
-}

src/dsp/gain/ComplexGain.java

@@ -1,31 +0,0 @@
-package dsp.gain;
-
-import sample.Listener;
-import sample.complex.Complex;
-
-public class ComplexGain implements Listener<Complex>
-{
-	private float mGain;
-	private Listener<Complex> mListener;
-
-	public ComplexGain( float gain )
-	{
-		mGain = gain;
-	}
-	
-	@Override
-	public void receive( Complex sample )
-	{
-		if( mListener != null )
-		{
-			sample.multiply( mGain );
-			
-			mListener.receive( sample );
-		}
-	}
-
-	public void setListener( Listener<Complex> listener )
-	{
-		mListener = listener;
-	}
-}

src/dsp/psk/LSMDemodulator.java

@@ -1,589 +0,0 @@
-package dsp.psk;
-
-/*******************************************************************************
- *     SDR Trunk 
- *     Copyright (C) 2014, 2015 Dennis Sheirer
- * 
- * 	   Gardner detector, Costas loop and Interpolator derived from:
- * 
- * 	   OP25 - gardner_costas_cc_impl.cc
- *     Copyright 2010, 2011, 2012, 2013 KA1RBI (gardner_costas_cc_impl.cc)
- *     
- *     OP25 - scope.py
- *     Copyright 2008-2011 Steve Glass
- *     Copyright 2011, 2012, 2013 KA1RBI
- *     
- *     GNURadio - control_loop and mpsk_receiver_cc
- *     Copyright 2011,2013 Free Software Foundation, Inc.
- *     
- *     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/>
- ******************************************************************************/
-
-import instrument.Instrumentable;
-import instrument.tap.Tap;
-import instrument.tap.TapGroup;
-import instrument.tap.stream.EyeDiagramData;
-import instrument.tap.stream.EyeDiagramDataTap;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import sample.Listener;
-import sample.complex.Complex;
-import sample.complex.ComplexSampleListener;
-import source.tuner.frequency.IFrequencyChangeListener;
-import buffer.FloatAveragingBuffer;
-import dsp.filter.interpolator.RealInterpolator;
-import dsp.symbol.Dibit;
-
-/**
- * Implements a LSM (Pi/4) demodulator using a Gardner Detector to determine 
- * optimal sampling timing and a Costas Loop as a phase locked loop synchronized 
- * with the incoming signal carrier frequency.
- * 
- * Sample Rate: 48000
- * Symbol Rate: 4800
- */
-public class LSMDemodulator implements Instrumentable, ComplexSampleListener
-{
-	private List<TapGroup> mAvailableTaps;
-	
-	/* 45 degree rotation angle */
-	public static final float THETA = (float)( Math.PI / 4.0d ); 
-
-	/* 45 degree point */
-	public static final Complex POINT_45_DEGREES = 
-		new Complex( (float)Math.sin( THETA ), (float)Math.cos( THETA ) );
-	
-	private Listener<Complex> mSymbolListener;
-	
-	private GardnerSymbolTiming mGardnerDetector = new GardnerSymbolTiming();
-	
-	private CostasLoop mCostasLoop = new CostasLoop();
-	
-	private IFrequencyChangeListener mFrequencyChangeListener;
-	
-	private EyeDiagramDataTap mEyeDiagramDataTap;
-	
-	public LSMDemodulator()
-	{
-	}
-	
-	public void dispose()
-	{
-		mSymbolListener = null;
-		mFrequencyChangeListener = null;
-	}
-	
-	public void setSymbolListener( Listener<Complex> listener )
-	{
-		mSymbolListener = listener;
-	}
-	
-	public void removeSymbolListener()
-	{
-		mSymbolListener = null;
-	}
-	
-	@Override
-	public void receive( float inphase, float quadrature )
-	{
-		mGardnerDetector.receive( inphase, quadrature );
-	}
-	
-	/**
-	 * Applies a phase correction value to the costas loop to correct when a
-	 * phase lock error is detected in the binary output stream.
-	 * 
-	 * @param correction - value in radians
-	 */
-	public void correctPhaseError( double correction )
-	{
-		mCostasLoop.correctPhaseError( correction );
-	}
-	
-	/**
-	 * Constrains value to the range of ( -maximum <> maximum )
-	 */
-	public static float clip( float value, float maximum )
-	{
-		if( value > maximum )
-		{
-			return maximum;
-		}
-		else if( value < -maximum )
-		{
-			return -maximum;
-		}
-		
-		return value;
-	}
-	
-	/**
-	 * Constrains timing error to +/- the maximum value and corrects any
-	 * floating point invalid numbers
-	 */
-	private float normalize( float error, float maximum )
-	{
-		if( Float.isNaN( error ) )
-		{
-			return 0.0f;
-		}
-		else
-		{
-			return clip( error, maximum );
-		}
-	}
-	
-	public void addListener( IFrequencyChangeListener listener )
-	{
-		mFrequencyChangeListener = listener;
-	}
-	
-	public void removeListener( IFrequencyChangeListener listener )
-	{
-		mFrequencyChangeListener = null;
-	}
-
-	/**
-	 * Processes the current loop frequency of the costas loop and broadcasts
-	 * tuner frequency offset adjustments 10 times a second as needed to keep
-	 * the frequency offset below half of the maximum frequency
-	 */
-	public class FrequencyControl
-	{	
-		/* Set the trigger threshold at half of the maximum costas loop control
-		 * frequency */
-		private static final float CORRECTION_THRESHOLD_FREQUENCY = 
-			( 2.0f * (float)Math.PI * 600.0f ) / 48000.0f;
-
-		private FloatAveragingBuffer mBuffer = new FloatAveragingBuffer( 40 );
-		
-		private long mFrequencyError = 0;
-		
-		private int mCounter = 0;
-		
-		public void receive( float frequency )
-		{
-//			mCounter++;
-//			
-//			if( mCounter >= 480 )
-//			{
-//				float average = mBuffer.get( frequency );
-//				mLog.debug( "Avg:" + average + " Threshold:" + CORRECTION_THRESHOLD_FREQUENCY);
-//
-//				boolean correctionNeeded = false;
-//				
-//				if( average > CORRECTION_THRESHOLD_FREQUENCY )
-//				{
-//					mFrequencyError--;
-//
-//					correctionNeeded = true;
-//				}
-//				else if( average < -CORRECTION_THRESHOLD_FREQUENCY )
-//				{
-//					mFrequencyError++;
-//					
-//					correctionNeeded = true;
-//				}
-//				
-//				if( correctionNeeded && mFrequencyChangeListener != null )
-//				{
-//					mLog.debug( "Issuing Frequency Correction: " + mFrequencyError );
-//					mFrequencyChangeListener.frequencyChanged( 
-//						new FrequencyChangeEvent( Attribute.FREQUENCY_ERROR, 
-//								mFrequencyError ) );
-//				}
-//				
-//				mCounter = 0;
-//			}
-//			else
-//			{
-//				mBuffer.get( frequency );
-//			}
-		}
-	}
-
-	/**
-	 * Gardner symbol timing detector
-	 */
-	public class GardnerSymbolTiming implements ComplexSampleListener
-	{
-		public static final int HALF_SAMPLES_PER_SYMBOL = 5;
-		public static final int SAMPLES_PER_SYMBOL = 10;
-		public static final int TWICE_SAMPLES_PER_SYMBOL = 20;
-
-		private float[] mDelayLineInphase = new float[ 2 * TWICE_SAMPLES_PER_SYMBOL ];
-		private float[] mDelayLineQuadrature = new float[ 2 * TWICE_SAMPLES_PER_SYMBOL ];
-
-		private int mDelayLinePointer = 0;
-
-		/* Sampling point */
-		private float mMu = 10.0f;
-		private float mGainMu = 0.05f;
-		
-		/* Samples per symbol */
-		private float mOmega = 10.0f;
-		private float mGainOmega = 0.1f * mGainMu * mGainMu;
-		private float mOmegaRel = 0.005f;
-		private float mOmegaMid = 10.0f;
-
-		private RealInterpolator mInterpolator = new RealInterpolator( 1.0f );
-		
-		private Complex mPreviousSample = new Complex( 0, 0 );
-		private Complex mPreviousMiddleSample = new Complex( 0, 0 );
-		private Complex mPreviousSymbol = new Complex( 0, 0 );
-		
-		/**
-		 * Provides symbol sampling timing control
-		 */
-		public GardnerSymbolTiming()
-		{
-		}
-
-		@Override
-		public void receive( float inphase, float quadrature )
-		{
-			/* Count down samples per symbol until we calculate the symbol */
-			mMu--;
-
-			mCostasLoop.increment();
-			
-			/* Mix incoming sample with costas loop to remove any rotation 
-			 * that is present from a mis-tuned carrier frequency */
-			
-			Complex costas = mCostasLoop.getCurrentVector();
-			
-			float derotatedInphase = Complex.multiplyInphase( inphase, quadrature, costas.inphase(), costas.quadrature() );
-			float derotatedQuadrature = Complex.multiplyQuadrature( inphase, quadrature, costas.inphase(), costas.quadrature() );
-			
-			/* Fill up the delay line to use with the interpolator */
-			mDelayLineInphase[ mDelayLinePointer ] = derotatedInphase;
-			mDelayLineInphase[ mDelayLinePointer + TWICE_SAMPLES_PER_SYMBOL ] = derotatedInphase;
-
-			mDelayLineQuadrature[ mDelayLinePointer ] = derotatedQuadrature;
-			mDelayLineQuadrature[ mDelayLinePointer + TWICE_SAMPLES_PER_SYMBOL ] = derotatedQuadrature;
-
-			/* Increment pointer and keep pointer in bounds */
-			mDelayLinePointer = ( mDelayLinePointer + 1 ) % TWICE_SAMPLES_PER_SYMBOL;
-			
-			/* Calculate the symbol once we've stored enough samples */
-			if( mMu <= 1.0f )
-			{
-				float half_omega = mOmega / 2.0f;
-				int half_sps = (int)Math.floor( half_omega );
-				float half_mu = mMu + half_omega - (float)half_sps;
-				
-				if( half_mu > 1.0 )
-				{
-					half_mu -= 1.0;
-					half_sps += 1;
-				}
-
-				/* Calculate interpolated middle sample and current sample */
-				float middleSampleInphase = mInterpolator.filter( 
-						mDelayLineInphase, mDelayLinePointer, mMu );
-				float middleSampleQuadrature = mInterpolator.filter( 
-						mDelayLineQuadrature, mDelayLinePointer, mMu );
-
-				int index = mDelayLinePointer + half_sps;
-				
-				float currentSampleInphase = mInterpolator.filter( 
-						mDelayLineInphase, index, half_mu );
-				float currentSampleQuadrature = mInterpolator.filter( 
-						mDelayLineQuadrature, index, half_mu );
-
-				/* Multiply current sample and conjugate (negated quadrature) of 
-				 * previous sample to get symbols to use for gardner error feedback */
-				Complex middleSymbol = Complex.multiply( middleSampleInphase, 
-						middleSampleQuadrature, mPreviousMiddleSample.conjugate() );
-				Complex currentSymbol = Complex.multiply( currentSampleInphase, 
-						currentSampleQuadrature, mPreviousSample.conjugate() );
-
-				/* Set gain to unity */
-				middleSymbol.normalize();
-				currentSymbol.normalize();
-
-				/* Gardner timing error calculations */
-				float errorInphase = ( mPreviousSymbol.inphase() - 
-						currentSymbol.inphase() ) * middleSymbol.inphase();
-
-				float errorQuadrature = ( mPreviousSymbol.quadrature() - 
-						currentSymbol.quadrature() ) * middleSymbol.quadrature();
-
-				float gardnerError = normalize( errorInphase + errorQuadrature, 1.0f );
-				
-				if( mEyeDiagramDataTap != null )
-				{
-					mEyeDiagramDataTap.receive( 
-						new EyeDiagramData( 
-								Arrays.copyOfRange( mDelayLineInphase, 0, 20 ), 
-								Arrays.copyOfRange( mDelayLineQuadrature, 0, 20 ), 
-							mMu, (float)half_sps + half_mu, gardnerError ) );
-				}
-				
-				/* mOmega is samples per symbol and is constrained to floating
-				 * between +/- .005 of the nominal 10.0 samples per symbol */
-				mOmega = mOmega + mGainOmega * gardnerError;
-				mOmega = mOmegaMid + clip( mOmega - mOmegaMid, mOmegaRel );
-
-				/* Adjust sample timing based on error of current sample */
-				mMu += mOmega + ( mGainMu * gardnerError );
-
-				/* Store current samples/symbols to use for the next period */
-				mPreviousSample.setValues( currentSampleInphase, currentSampleQuadrature );
-				mPreviousMiddleSample.setValues( middleSampleInphase, middleSampleQuadrature );
-				mPreviousSymbol = currentSymbol;
-
-				/* Update costas loop using phase error present in current 
-				 * symbol.  The symbol is rotated from star orientation to polar
-				 * orientation to simplify error calculation */
-				mCostasLoop.receive( currentSymbol );
-//				mCostasLoop.receive( 
-//						ComplexSample.multiply( currentSymbol, POINT_45_DEGREES ) );
-				
-				/* Dispatch the differentiated symbol to the registered listener */
-				if( mSymbolListener != null )
-				{
-					mSymbolListener.receive( currentSymbol );
-				}
-			}
-		}
-	}
-	
-	/**
-	 * Costas Loop - phase locked loop synchronized to the frequency offset of
-	 * the incoming signal to enable the signal to be mixed down to zero offset
-	 * for proper synchronization.  The mFrequency value indicates the detected
-	 * frequency offset.  We attempt to keep that value close to zero by issuing
-	 * frequency adjustments to the tuner channel source.
-	 * 
-	 * Most of the costas loop code was ported from gnuradio/control_loop and 
-	 * gnuradio/mpsk_receiver_cc using initialization values from KA1RBI's 
-	 * OP25/cqpsk.py
-	 */
-	public class CostasLoop implements Listener<Complex>
-	{
-		public static final double TWO_PI = 2.0 * Math.PI;
-		
-		private static final float MAXIMUM_FREQUENCY = 
-				( 2400.0f * (float)TWO_PI ) / 48000.0f;
-		
-		/* http://www.trondeau.com/blog/2011/8/13/control-loop-gain-values.html */
-		private float mDamping = (float)Math.sqrt( 2.0 ) / 2.0f;
-		
-		/* Use denominator between 100 (most) and 400 (least) to adjust costas
-		 * loop control level */
-		private float mLoopBandwidth = (float)( TWO_PI / 400.0d );
-		
-		private float mAlphaGain = ( 4.0f * mDamping * mLoopBandwidth ) / 
-						  ( 1.0f + ( 2.0f * mDamping * mLoopBandwidth ) + 
-								   ( mLoopBandwidth * mLoopBandwidth ) );
-
-		private float mBetaGain = ( 4.0f * mLoopBandwidth * mLoopBandwidth ) / 
-							   ( 1.0f + ( 2.0f * mDamping * mLoopBandwidth ) + 
-								   ( mLoopBandwidth * mLoopBandwidth ) );
-
-		private float mLoopPhase = 0.0f;
-		
-		private float mLoopFrequency = 0.0f;
-		
-		private FrequencyControl mFrequencyControl = new FrequencyControl();
-		
-		public CostasLoop()
-		{
-		}
-		
-		/**
-		 * Applies a phase correction value to the current phasor.  Use this 
-		 * method to apply correction when a +/- 90, or 180 degree phase error
-		 * is detected in the binary output stream.
-		 * 
-		 * If the supplied correction value places the loop frequency outside
-		 * of the max frequency, then the frequency will be corrected 360
-		 * degrees in the opposite direction to maintain within the max
-		 * frequency bounds.
-		 * 
-		 * @param correction - correction value in radians
-		 */
-		public void correctPhaseError( double correction )
-		{
-			mLoopFrequency += correction;
-		
-			if( mLoopFrequency > MAXIMUM_FREQUENCY )
-			{
-				mLoopFrequency -= 2.0d * MAXIMUM_FREQUENCY;
-			}
-			
-			if( mLoopFrequency < -MAXIMUM_FREQUENCY )
-			{
-				mLoopFrequency += 2.0d * MAXIMUM_FREQUENCY;
-			}
-		}
-		
-		/**
-		 * Increments the phase of the loop
-		 */
-		public void increment()
-		{
-			mLoopPhase += mLoopFrequency;
-
-			/* Keep the loop phase in bounds */
-			unwrapPhase();
-		}
-
-		private void unwrapPhase()
-		{
-			while( mLoopPhase > TWO_PI )
-			{
-				mLoopPhase -= TWO_PI;
-			}
-			
-			while( mLoopPhase < -TWO_PI )
-			{
-				mLoopPhase += TWO_PI;
-			}
-		}
-		
-		/**
-		 * Current vector of the loop rotated by THETA degrees.
-		 */
-		public Complex getCurrentVector()
-		{
-//			return ComplexSample.fromAngle( mLoopPhase + THETA );
-			return Complex.fromAngle( mLoopPhase );
-		}
-		
-		@Override
-		public void receive( Complex complex )
-		{
-			/* Calculate phase error */
-			float phaseError = getPhaseError( complex );
-			
-			Dibit d = QPSKPolarSlicer.decide( complex );
-//			mLog.debug( "Dibit: " + d.name() + " Error: " + phaseError );
-
-			/* Adjust for phase error */
-			adjust( phaseError );
-		}
-
-		/**
-		 * Updates the costas loop frequency and phase to adjust for the phase
-		 * error value 
-		 * 
-		 * @param phase_error - (-)= late and (+)= early
-		 */
-		private void adjust( float phase_error )
-		{
-			mLoopFrequency += mBetaGain * phase_error;
-			mLoopPhase += mLoopFrequency + mAlphaGain * phase_error;
-
-			/* Maintain phase between +/- 2 * PI */
-			unwrapPhase();
-
-			/* Limit frequency to +/- maximum loop frequency */
-			limitFrequency();
-		}
-
-		/**
-		 * Constrains the frequency within the bounds of +/- loop frequency
-		 */
-		private void limitFrequency()
-		{
-			/* Check for and issue tuner offset correction */
-			mFrequencyControl.receive( mLoopFrequency );
-			
-			if( mLoopFrequency > MAXIMUM_FREQUENCY )
-			{
-				mLoopFrequency = MAXIMUM_FREQUENCY;
-			}
-			
-			if( mLoopFrequency < -MAXIMUM_FREQUENCY )
-			{
-				mLoopFrequency = -MAXIMUM_FREQUENCY;
-			}
-		}
-
-		/**
-		 * Detects rotational error present when the costas loop is not aligned
-		 * with the carrier frequency.  Provides error feedback to adjust 
-		 * mixer frequency.
-		 */
-		public float getPhaseError( Complex complex )
-		{
-			  float phase_error = 0;
-			  
-			  if( Math.abs( complex.inphase() ) > Math.abs( complex.quadrature() ) ) 
-			  {
-				  if( complex.inphase() > 0 )
-				  {
-					  phase_error = -complex.quadrature();
-				  }
-				  else
-				  {
-					  phase_error = complex.quadrature();
-				  }
-			  }
-			  else 
-			  {
-				  if( complex.quadrature() > 0 )
-				  {
-					  phase_error = complex.inphase();
-				  }
-				  else
-				  {
-					  phase_error = -complex.inphase();
-				  }
-			  }
-			  
-			  return phase_error;
-		}
-	}
-
-	@Override
-	public List<TapGroup> getTapGroups()
-	{
-		if( mAvailableTaps == null )
-		{
-			mAvailableTaps = new ArrayList<>();
-			
-			TapGroup group = new TapGroup( "LSM Demodulator" );
-			
-			group.add( new EyeDiagramDataTap( "Eye Diagram", 0, 4800 ) );
-
-			mAvailableTaps.add( group );
-		}
-		
-		return mAvailableTaps;
-	}
-
-	@Override
-	public void registerTap( Tap tap )
-	{
-		if( tap instanceof EyeDiagramDataTap )
-		{
-			mEyeDiagramDataTap = (EyeDiagramDataTap)tap;
-		}
-	}
-
-	@Override
-	public void unregisterTap( Tap tap )
-	{
-		if( tap instanceof EyeDiagramDataTap )
-		{
-			mEyeDiagramDataTap = null;
-		}
-	}
-}

src/dsp/psk/QPSKStarSlicer.java

@@ -1,58 +0,0 @@
-package dsp.psk;
-
-import sample.Broadcaster;
-import sample.Listener;
-import sample.complex.Complex;
-import dsp.symbol.Dibit;
-
-public class QPSKStarSlicer implements Listener<Complex>
-{
-	private Broadcaster<Dibit> mBroadcaster = new Broadcaster<Dibit>();
-
-	/**
-	 * Slices a ComplexSample representing a phase shifted symbol according to
-	 * the following constellation pattern:
-	 * 
-	 *    00 | 01
-	 *    ---|---
-	 *    10 | 11
-	 */
-	public QPSKStarSlicer()
-	{
-	}
-	
-	public void dispose()
-	{
-		mBroadcaster.dispose();
-		mBroadcaster = null;
-	}
-
-	public void addListener( Listener<Dibit> listener )
-	{
-		mBroadcaster.addListener( listener );
-	}
-
-	public void removeListener( Listener<Dibit> listener )
-	{
-		mBroadcaster.removeListener( listener );
-	}
-
-	@Override
-	public void receive( Complex sample )
-	{
-		mBroadcaster.broadcast( decide( sample ) );
-	}
-	
-	public static Dibit decide( Complex sample )
-	{
-		if( sample.inphase() > 0 )
-		{
-			return sample.quadrature() > 0 ? Dibit.D00_PLUS_1 : Dibit.D10_MINUS_1;
-		}
-		else
-		{
-			return sample.quadrature() > 0 ? Dibit.D01_PLUS_3 : Dibit.D11_MINUS_3;
-		}
-	}
-	
-}

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

@@ -0,0 +1,351 @@
+/*******************************************************************************
+ *     SDR Trunk 
+ *     Copyright (C) 2014-2016 Dennis Sheirer
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>
+ ******************************************************************************/
+package io.github.dsheirer.alias;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
+import io.github.dsheirer.alias.action.AliasAction;
+import io.github.dsheirer.alias.id.AliasID;
+import io.github.dsheirer.alias.id.AliasIDType;
+import io.github.dsheirer.alias.id.broadcast.BroadcastChannel;
+import io.github.dsheirer.alias.id.nonrecordable.NonRecordable;
+import io.github.dsheirer.alias.id.priority.Priority;
+
+import java.awt.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+import java.util.TreeSet;
+
+@JacksonXmlRootElement(localName = "alias")
+public class Alias
+{
+    private String mList;
+    private String mGroup;
+    private String mName;
+    private int mColor;
+    private String mIconName;
+    private List<AliasID> mAliasIDs = new ArrayList<AliasID>();
+    private List<AliasAction> mAliasActions = new ArrayList<AliasAction>();
+
+    public Alias()
+    {
+    }
+
+    public Alias(String name)
+    {
+        mName = name;
+    }
+
+    public String toString()
+    {
+        return getName();
+    }
+
+    @JacksonXmlProperty(isAttribute = true, localName = "name")
+    public String getName()
+    {
+        return mName;
+    }
+
+    public void setName(String name)
+    {
+        mName = name;
+    }
+
+    @JacksonXmlProperty(isAttribute = true, localName = "list")
+    public String getList()
+    {
+        return mList;
+    }
+
+    public void setList(String list)
+    {
+        mList = list;
+    }
+
+    public boolean hasList()
+    {
+        return mList != null;
+    }
+
+    @JacksonXmlProperty(isAttribute = true, localName = "group")
+    public String getGroup()
+    {
+        return mGroup;
+    }
+
+    public void setGroup(String group)
+    {
+        mGroup = group;
+    }
+
+    public boolean hasGroup()
+    {
+        return mGroup != null;
+    }
+
+    @JacksonXmlProperty(isAttribute = true, localName = "color")
+    public int getColor()
+    {
+        return mColor;
+    }
+
+    public void setColor(int color)
+    {
+        mColor = color;
+    }
+
+    @JsonIgnore
+    public Color getDisplayColor()
+    {
+        return new Color(getColor());
+    }
+
+    @JacksonXmlProperty(isAttribute = true, localName = "iconName")
+    public String getIconName()
+    {
+        return mIconName;
+    }
+
+    public void setIconName(String iconName)
+    {
+        mIconName = iconName;
+    }
+
+    @JacksonXmlProperty(isAttribute = false, localName = "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);
+    }
+
+    @JacksonXmlProperty(isAttribute = false, localName = "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
+     */
+    @JsonIgnore
+    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;
+     */
+    @JsonIgnore
+    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;
+     */
+    @JsonIgnore
+    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.
+     */
+    @JsonIgnore
+    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;
+    }
+}

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

@@ -1,9 +1,9 @@
-package alias;
+package io.github.dsheirer.alias;
 
-import audio.broadcast.BroadcastModel;
 import com.jidesoft.swing.JideSplitPane;
-import gui.editor.Editor;
-import icon.IconManager;
+import io.github.dsheirer.audio.broadcast.BroadcastModel;
+import io.github.dsheirer.gui.editor.Editor;
+import io.github.dsheirer.icon.IconManager;
 import net.coderazzi.filters.gui.AutoChoices;
 import net.coderazzi.filters.gui.TableFilterHeader;
 import net.miginfocom.swing.MigLayout;

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

@@ -15,27 +15,21 @@
  *     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;
+package io.github.dsheirer.alias;
 
 import com.jidesoft.swing.JideTabbedPane;
+import io.github.dsheirer.alias.action.AliasActionEditor;
+import io.github.dsheirer.alias.id.AliasIdentifierEditor;
+import io.github.dsheirer.audio.broadcast.BroadcastModel;
+import io.github.dsheirer.gui.editor.Editor;
+import io.github.dsheirer.icon.IconManager;
+import io.github.dsheirer.sample.Listener;
+import net.miginfocom.swing.MigLayout;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 
 public class AliasEditor extends Editor<Alias> 
 			implements ActionListener, Listener<AliasEvent>

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

@@ -15,7 +15,7 @@
  *     You should have received a copy of the GNU General Public License
  *     along with this program.  If not, see <http://www.gnu.org/licenses/>
  ******************************************************************************/
-package alias;
+package io.github.dsheirer.alias;
 
 public class AliasEvent
 {