Updates build to 0.4.0 alpha 3

401 Update Tuners to use Heterodyne Channelizer

.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

@@ -3,13 +3,20 @@
     <words>
       <w>bahroo</w>
       <w>broadcastify</w>
+      <w>correlator</w>
+      <w>dinf</w>
       <w>esnid</w>
       <w>fleetsync</w>
+      <w>heterdyned</w>
+      <w>heterodynes</w>
       <w>icecast</w>
       <w>ident</w>
+      <w>nutall</w>
       <w>overflowable</w>
       <w>polyphase</w>
+      <w>qpsk</w>
       <w>remez</w>
+      <w>resampler</w>
       <w>samplerate</w>
       <w>sdrtrunk</w>
       <w>sheirer</w>

.idea/libraries/imports.xml

@@ -1,33 +1,12 @@
 <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!/" />
+      <root url="jar://$PROJECT_DIR$/imports/radioreference-14.jar!/" />
+      <root url="jar://$PROJECT_DIR$/imports/wsdl4j-1.5.1.jar!/" />
+      <root url="jar://$PROJECT_DIR$/imports/commons-math3-3.6.1.jar!/" />
+      <root url="jar://$PROJECT_DIR$/imports/libresample4j-0.1.3.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />

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

.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,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="IssueNavigationConfiguration">
+    <option name="links">
+      <list>
+        <IssueNavigationLink>
+          <option name="issueRegexp" value="#(\d+)" />
+          <option name="linkRegexp" value="https://github.com/DSheirer/sdrtrunk/issues/$1" />
+        </IssueNavigationLink>
+      </list>
+    </option>
+  </component>
   <component name="VcsDirectoryMappings">
-    <mapping directory="" 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,24 @@
+0.3.4 20180418
+ - New P25 C4FM decoder that uses Differential QPSK decoder instead of FM demodulation with 4FSK.
+ - Adds channel auto-start and ordering capability with startup dialog allowing user to invoke or bypass channel
+   auto-start.  Provides user with more control over startup configuration.
+ - Adds preferred tuner attribute to channel configuration allowing user to select a preferred tuner for the channel
 
-0.3.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 +53,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

LICENSE

@@ -631,8 +631,8 @@ to attach them to the start of each source file to most effectively
 state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
+    {one line to give the program's name and a brief idea of what it does.}
+    Copyright (C) {year}  {name of author}
 
     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
@@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail.
   If the program does terminal interaction, make it output a short
 notice like this when it starts in an interactive mode:
 
-    <program>  Copyright (C) <year>  <name of author>
+    {project}  Copyright (C) {year}  {fullname}
     This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.
@@ -671,4 +671,4 @@ into proprietary programs.  If your program is a subroutine library, you
 may consider it more useful to permit linking proprietary applications with
 the library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.

README.md

@@ -1,11 +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.2.0](https://github.com/DSheirer/sdrtrunk/wiki/UserManual)
-* [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)
-**Figure 1:** sdrtrunk **Version 0.3.0** Application Screenshot
+![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.4.0-alpha.3'
+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,121 +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="0"/>
-  <property name="release" value="-beta12"/>
-  <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.license"  location="${repo}/license"/>
-  <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" description="Compile java classes" >
-    <javac srcdir="${source.code}" destdir="${output.classes}" classpathref="classpath" includeantruntime="false" />
-  </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="${source.license}">
-        <include name="license.txt"/>
-      </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="${source.license}">
-        <include name="license.txt"/>
-      </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

license/copyright_header.txt

@@ -1,17 +0,0 @@
-/*******************************************************************************
- *     SDR Trunk 
- *     Copyright (C) 2014-2016 Dennis Sheirer
- * 
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- * 
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- * 
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>
- ******************************************************************************/

scripts/run_sdrtrunk_linux.sh

@@ -1,2 +0,0 @@
-#!/bin/bash
-java -XX:+UseG1GC -cp "*:libs/*" gui.SDRTrunk

scripts/run_sdrtrunk_windows.bat

@@ -1 +0,0 @@
-java -XX:+UseG1GC -cp "SDRTrunk.jar;*;libs/*;config/*;images/*" gui.SDRTrunk

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

@@ -6,20 +6,9 @@
       <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/audio/AudioModule.java

@@ -1,188 +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 audio;
-
-import audio.squelch.ISquelchStateListener;
-import audio.squelch.SquelchState;
-import channel.metadata.Metadata;
-import dsp.filter.design.FilterDesignException;
-import dsp.filter.fir.FIRFilterSpecification;
-import dsp.filter.fir.remez.RemezFIRFilterDesigner;
-import dsp.filter.polyphase.PolyphaseFIRDecimatingFilter_RB;
-import module.Module;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import sample.Listener;
-import sample.real.IFilteredRealBufferListener;
-import sample.real.RealBuffer;
-
-import java.util.concurrent.ScheduledExecutorService;
-
-/**
- * Provides packaging of demodulated audio sample buffers into audio packets for
- * broadcast to registered audio packet listeners.  Includes audio packet
- * metadata in constructed audio packets.
- *
- * Incorporates audio squelch state listener to control if audio packets are
- * broadcast or ignored.
- */
-public class AudioModule extends Module implements IAudioPacketProvider, IFilteredRealBufferListener,
-    ISquelchStateListener, Listener<RealBuffer>
-{
-    protected static final Logger mLog = LoggerFactory.getLogger(AudioModule.class);
-
-    private static float[] mDecimationCoefficients;
-
-    static
-    {
-        //Band-pass filter to both decimate (48kHz to 8kHz) and block 0 - 300 Hz (LTR signalling).
-        FIRFilterSpecification specification = FIRFilterSpecification.bandPassBuilder()
-            .sampleRate(48000)
-            .stopFrequency1(150)
-            .passFrequencyBegin(300)
-            .passFrequencyEnd(3500)
-            .stopFrequency2(4000)
-            .stopRipple(0.0004)
-            .passRipple(0.008)
-            .build();
-
-        RemezFIRFilterDesigner designer = new RemezFIRFilterDesigner(specification);
-
-        try
-        {
-            if(!designer.isValid())
-            {
-                throw new FilterDesignException("Couldn't design the audio decimation filter");
-            }
-
-            mDecimationCoefficients = designer.getImpulseResponse();
-        }
-        catch(FilterDesignException e)
-        {
-            mLog.debug("Error designing filter", e);
-        }
-    }
-
-    private SquelchStateListener mSquelchStateListener = new SquelchStateListener();
-    private SquelchState mSquelchState = SquelchState.SQUELCH;
-    private Listener<AudioPacket> mAudioPacketListener;
-    private PolyphaseFIRDecimatingFilter_RB mAudioDecimationFilter;
-    private Metadata mMetadata;
-
-    public AudioModule(Metadata metadata)
-    {
-        mMetadata = metadata;
-
-        mAudioDecimationFilter = new PolyphaseFIRDecimatingFilter_RB(mDecimationCoefficients, 6, 2.0f);
-        mAudioDecimationFilter.setListener(new Listener<RealBuffer>()
-        {
-            @Override
-            public void receive(RealBuffer realBuffer)
-            {
-                if(mAudioPacketListener != null)
-                {
-                    AudioPacket packet = new AudioPacket(realBuffer.getSamples(), mMetadata.copyOf());
-                    mAudioPacketListener.receive(packet);
-                }
-            }
-        });
-    }
-
-    @Override
-    public void dispose()
-    {
-        mSquelchStateListener = null;
-        mAudioPacketListener = null;
-    }
-
-    @Override
-    public void reset()
-    {
-    }
-
-    @Override
-    public void start(ScheduledExecutorService executor)
-    {
-        /* No start operations provided */
-    }
-
-    @Override
-    public void stop()
-    {
-        /* Issue an end audio packet in case a recorder is still rolling */
-        if(mAudioPacketListener != null)
-        {
-            mAudioPacketListener.receive(new AudioPacket(AudioPacket.Type.END, mMetadata.copyOf()));
-        }
-    }
-
-    /**
-     * Processes demodulated audio samples into audio packets with current audio
-     * metadata and sends to the registered listener
-     */
-    @Override
-    public void receive(RealBuffer buffer)
-    {
-        if(mAudioPacketListener != null && mSquelchState == SquelchState.UNSQUELCH)
-        {
-            mAudioDecimationFilter.receive(buffer);
-        }
-    }
-
-    @Override
-    public Listener<RealBuffer> getFilteredRealBufferListener()
-    {
-        return this;
-    }
-
-    @Override
-    public void setAudioPacketListener(Listener<AudioPacket> listener)
-    {
-        mAudioPacketListener = listener;
-    }
-
-    @Override
-    public void removeAudioPacketListener()
-    {
-        mAudioPacketListener = null;
-    }
-
-    @Override
-    public Listener<SquelchState> getSquelchStateListener()
-    {
-        return mSquelchStateListener;
-    }
-
-    /**
-     * Wrapper for squelch state listener
-     */
-    public class SquelchStateListener implements Listener<SquelchState>
-    {
-        @Override
-        public void receive(SquelchState state)
-        {
-            if(state == SquelchState.SQUELCH && mAudioPacketListener != null)
-            {
-                mAudioPacketListener.receive(new AudioPacket(AudioPacket.Type.END, mMetadata.copyOf()));
-            }
-
-            mSquelchState = state;
-        }
-    }
-}

src/audio/AudioPacketRateCounter.java

@@ -1,56 +0,0 @@
-package audio;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import sample.Listener;
-
-public class AudioPacketRateCounter implements Listener<AudioPacket>
-{
-	private final static Logger mLog = 
-			LoggerFactory.getLogger( AudioPacketRateCounter.class );
-
-	private Listener<AudioPacket> mListener;
-	private long mCount;
-	private long mStartTime = -1;
-	
-	private String mName;
-	
-	public AudioPacketRateCounter()
-	{
-		mName = "UNNAMED";
-	}
-	
-	public AudioPacketRateCounter( String name )
-	{
-		mName = name;
-	}
-	
-	@Override
-	public void receive( AudioPacket packet )
-	{
-		if( mStartTime == -1 )
-		{
-			mStartTime = System.currentTimeMillis();
-		}
-		
-		mCount += packet.getAudioBuffer().getSamples().length;
-
-		long elapsed = System.currentTimeMillis() - mStartTime;
-		
-		if( elapsed != 0 )
-		{
-			mLog.debug( "[" + mName + "] Audio Rate: " + ( mCount / elapsed ) + " kHz" );
-		}
-		
-		if( mListener != null )
-		{
-			mListener.receive( packet );
-		}
-	}
-	
-	public void setListener( Listener<AudioPacket> listener )
-	{
-		mListener = listener;
-	}
-}

src/audio/IAudioPacketListener.java

@@ -1,8 +0,0 @@
-package audio;
-
-import sample.Listener;
-
-public interface IAudioPacketListener
-{
-	public Listener<AudioPacket> getAudioPacketListener();
-}

src/audio/IAudioPacketProvider.java

@@ -1,9 +0,0 @@
-package audio;
-
-import sample.Listener;
-
-public interface IAudioPacketProvider
-{
-	public void setAudioPacketListener( Listener<AudioPacket> listener );
-	public void removeAudioPacketListener();
-}

src/audio/squelch/ManualSquelchController.java

@@ -1,40 +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 audio.squelch;
-
-
-/**
- * Provides squelch control based on presense of decoded audio samples.
- * 
- * NOTE: this class is not yet fully implemented with audio sample processing
- * and currently only provides user driven squelch control
- */
-public class ManualSquelchController extends SquelchController
-{
-	public ManualSquelchController()
-	{
-		mSquelchMode = SquelchMode.NONE;
-	}
-
-	@Override
-	public void setSquelchMode( SquelchMode mode )
-	{
-		//TODO: add functionality
-	}
-}

src/audio/squelch/SquelchController.java

@@ -1,122 +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 audio.squelch;
-
-import sample.Broadcaster;
-import sample.Listener;
-import sample.real.RealBuffer;
-import sample.real.RealSampleListener;
-import sample.real.RealToRealBufferAssembler;
-
-/**
- * Squelch control - receives single audio samples or real audio buffers and
- * adjusts squelch state either based on the audio samples or based on external
- * control inputs.  
- * 
- * Assembles received single audio samples into real sample buffers for 
- * consumption by an external audio processor, like the AudioPacketProcessor
- * class.
- */
-public abstract class SquelchController 
-				implements Listener<RealBuffer>, RealSampleListener
-{
-	private Broadcaster<SquelchState> mSquelchStateBroadcaster = new Broadcaster<>();
-	private Listener<RealBuffer> mAudioListener;
-	protected SquelchState mSquelchState = SquelchState.UNSQUELCH;
-	protected SquelchMode mSquelchMode = SquelchMode.MANUAL;
-	
-	private RealToRealBufferAssembler mSampleAssembler = new RealToRealBufferAssembler( 512 );
-	
-	public SquelchController()
-	{
-		mSampleAssembler.setListener( this );
-	}
-	
-	@Override
-	public void receive( float sample )
-	{
-		mSampleAssembler.receive( sample );
-	}
-
-	@Override
-	public void receive( RealBuffer buffer )
-	{
-		if( mAudioListener != null )
-		{
-			mAudioListener.receive( buffer );
-		}
-	}
-
-	public abstract void setSquelchMode( SquelchMode mode );
-
-	public SquelchMode getSquelchMode()
-	{
-		return mSquelchMode;
-	}
-
-	public void setSquelchState( SquelchState state )
-	{
-		mSquelchState = state;
-	}
-
-	public SquelchState getSquelchState()
-	{
-		return mSquelchState;
-	}
-
-	public boolean isSquelched()
-	{
-		switch( mSquelchMode )
-		{
-			case AUTOMATIC:
-			case MANUAL:
-				return mSquelchState == SquelchState.SQUELCH;
-			case NONE:
-				return false;
-			default:
-				return false;
-		}
-	}
-	
-	public void addSquelchStateListener( Listener<SquelchState> listener )
-	{
-		if( listener != null )
-		{
-			mSquelchStateBroadcaster.addListener( listener );
-			
-			/* Send current squelch state to the listener */
-			listener.receive( mSquelchState );
-		}
-	}
-
-	public void removeSquelchStateListener( Listener<SquelchState> listener )
-	{
-		mSquelchStateBroadcaster.removeListener( listener );
-	}
-	
-	public void setAudioListener( Listener<RealBuffer> listener )
-	{
-		mAudioListener = listener;
-	}
-	
-	public void removeAudioListener( Listener<RealBuffer> listener )
-	{
-		mAudioListener = null;
-	}
-}

src/audio/squelch/TrunkingSquelchController.java

@@ -1,55 +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 audio.squelch;
-
-public class TrunkingSquelchController extends SquelchController
-{
-	private boolean mAllowSquelchOverride = true;
-	
-	public TrunkingSquelchController()
-	{
-	}
-	
-	/**
-	 * Provides control over audio stream as directed by an external trunking 
-	 * channel state.
-	 * 
-	 * Override automatic squelch control by setting the squelch mode to none.
-	 * 
-	 * Disable automatic control override by setting allowManualOverride to false;
-	 * 
-	 * Note: this control does not respond to squelch mode manual.
-	 */
-	public TrunkingSquelchController( boolean allowSquelchOverride )
-	{
-		mAllowSquelchOverride = allowSquelchOverride;
-		
-		mSquelchMode = SquelchMode.AUTOMATIC;
-	}
-
-	@Override
-	public void setSquelchMode( SquelchMode mode )
-	{
-		if( mode == SquelchMode.AUTOMATIC ||
-			( mode == SquelchMode.NONE && mAllowSquelchOverride ) )
-		{
-			mSquelchMode = mode;
-		}
-	}
-}

src/bits/ISyncDetectListener.java

@@ -1,6 +0,0 @@
-package bits;
-
-public interface ISyncDetectListener
-{
-	public void syncDetected();
-}

src/bits/ISyncProcessor.java

@@ -1,6 +0,0 @@
-package bits;
-
-public interface ISyncProcessor
-{
-	public void checkSync( long value );
-}

src/bits/MessageFramer.java

@@ -1,243 +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 bits;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-
-import sample.Broadcaster;
-import sample.Listener;
-import dsp.symbol.SyncDetectListener;
-import dsp.symbol.SyncDetectProvider;
-
-/**
- * MessageFramer - processes bitsets looking for a sync pattern within
- * the bits, and then extracts the message, including the sync 
- * pattern, for a total bit length of messageLength.
- * 
- * Will extract multiple messages simultaneously, for each sync pattern that is
- * encountered within the bitset bit stream.
- */
-public class MessageFramer implements Listener<Boolean>, 
-									  SyncDetectProvider
-{
-	private boolean[] mSyncPattern;
-	private int mMessageLength;
-	private SyncDetectListener mSyncDetectListener;
-	private Broadcaster<BinaryMessage> mBroadcaster = 
-								new Broadcaster<BinaryMessage>();
-	private ArrayList<MessageAssembler> mMessageAssemblers = 
-                            new ArrayList<MessageAssembler>();
-
-	private ArrayList<MessageAssembler> mCompletedMessageAssemblers = 
-    								new ArrayList<MessageAssembler>();
-    
-	private BinaryMessage mPreviousBuffer = null;
-
-	private SyncPatternMatcher mMatcher;
-    
-    public MessageFramer( boolean[] syncPattern, int messageLength )
-    {
-        mSyncPattern = syncPattern;
-        mMatcher = new SyncPatternMatcher( syncPattern );
-        mMessageLength = messageLength;
-    }
-    
-    public void reset()
-    {
-    	for( MessageAssembler assembler: mMessageAssemblers )
-    	{
-    		assembler.dispose();
-    	}
-        	
-        mMessageAssemblers.clear();
-    }    
-    
-    public void dispose()
-    {
-    	mBroadcaster.dispose();
-    	mCompletedMessageAssemblers.clear();
-    	mMessageAssemblers.clear();
-    }
-
-    @Override
-    public void receive( Boolean bit )
-    {
-    	mMatcher.receive( bit );
-    	
-        Iterator<MessageAssembler> it = mMessageAssemblers.iterator();
-        
-        MessageAssembler assembler;
-        
-        while( it.hasNext() )
-        {
-            assembler = it.next();
-
-            /* Dispose and remove any completed assemblers */
-            if( assembler.complete() )
-            {
-            	assembler.dispose();
-            	it.remove();
-            }
-            /* Otherwise, send them the bit */
-            else
-            {
-                assembler.receive( bit );
-            }
-        }
-        
-        /* Check for sync match and add new message assembler */
-    	if( mMatcher.matches() )
-    	{
-            addMessageAssembler( new MessageAssembler( mMessageLength, mSyncPattern ) );
-            
-            /* Notify any sync detect listener(s) */
-            if( mSyncDetectListener != null )
-            {
-            	mSyncDetectListener.syncDetected();
-            }
-    	}
-    }
-    
-    /**
-     * Causes all messages currently under assembly to be forcibly
-     * sent (ie flushed) to all registered message listeners, and
-     * subsequently, all assemblers to be deleted
-     */
-    public void flush()
-    {
-        for( MessageAssembler assembler: mMessageAssemblers )
-        {
-            assembler.flush();
-        }
-    }
-    
-	@Override
-    public void setSyncDetectListener( SyncDetectListener listener )
-    {
-		mSyncDetectListener = listener;
-    }
-    
-    /**
-     * Allow a message listener to register with this framer to receive
-     * all framed messages
-     */
-    public void addMessageListener( Listener<BinaryMessage> listener )
-    {
-        mBroadcaster.addListener( listener );
-    }
-    
-    public void removeMessageListener( Listener<BinaryMessage> listener )
-    {
-        mBroadcaster.removeListener( listener );
-    }
-
-    /*
-     * Adds a message assembler to receive bits from the bit stream
-     */
-    private void addMessageAssembler( MessageAssembler assembler )
-    {
-        mMessageAssemblers.add( assembler );
-    }
-
-    @SuppressWarnings( "unused" )
-	private void removeMessageAssembler( MessageAssembler assembler )
-    {
-        mMessageAssemblers.remove( assembler );
-    }
-
-    /**
-     * Assembles a binary message, starting with the initial fill of the 
-     * identified sync pattern, and every bit thereafter.  Once the accumulated
-     * bits equal the message length, the message is sent and the assembler
-     * flags itself as complete.
-     * 
-     * By design, multiple message assemblers can exist at the same time, each
-     * assembling different, overlapping potential messages
-     */
-    private class MessageAssembler implements Listener<Boolean>
-    {
-        BinaryMessage mMessage;
-        boolean mComplete = false;
-        
-        MessageAssembler( int messageLength )
-        {
-            mMessage = new BinaryMessage( messageLength );
-        }
-        
-        MessageAssembler( int messageLength, boolean[] initialFill )
-        {
-            this(  messageLength );
-            
-            /* Pre-load the message with the sync pattern */
-            for( int x = 0; x < initialFill.length; x++ )
-            {
-                receive( initialFill[ x ] );
-            }
-        }
-        
-        public void dispose()
-        {
-        	mMessage = null;
-        }
-
-        @Override
-        /**
-         * Receives one bit at a time, and assembles them into a message
-         */
-        public void receive( Boolean bit )
-        {
-            try
-            {
-                mMessage.add( bit );
-            }
-            catch( BitSetFullException e )
-            {
-                e.printStackTrace();
-            }
-            
-            /* Once our message is complete (ie full), send it to all registered
-             * message listeners, and set complete flag so for auto-removal */
-            if( mMessage.isFull() )
-            {
-                mComplete = true;
-                flush();
-            }
-        }
-
-        /**
-         * Flushes/Sends the current message, or partial message, and sets 
-         * complete flag to true, so that we can be auto-removed
-         */
-        public void flush()
-        {
-            mBroadcaster.receive( mMessage );
-            mComplete = true;
-        }
-
-        /**
-         * Flag to indicate when this assembler has received all of the bits it
-         * is looking for (ie message length), and should then be removed from
-         * receiving any more bits
-         */
-        public boolean complete()
-        {
-            return mComplete;
-        }
-    }
-}

src/bits/MultiSyncPatternMatcher.java

@@ -1,111 +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 bits;
-
-import org.apache.commons.lang3.Validate;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Multi-Sync pattern matcher.  Accepts multiple sync detector objects for 
- * comparision against the incoming bit stream.
- * 
- * Note: works for sync patterns up to 63 bits (integer size - 1 ) long.  
- * If a 64 bit or larger sync pattern is applied, then the wrapping feature
- * of the Long.rotate methods will wrap the MSB around to the LSB and
- * corrupt the matching value.
- *
- */
-public class MultiSyncPatternMatcher
-{
-	private List<ISyncProcessor> mSyncProcessors = new ArrayList<ISyncProcessor>();
-	
-	private long mBits = 0;
-	private long mMask = 0;
-	
-	public MultiSyncPatternMatcher( int syncSize )
-	{
-		Validate.isTrue(syncSize < 64);
-		
-		//Setup a bit mask of all ones the length of the sync pattern
-		mMask = (long)( ( Math.pow( 2, syncSize ) ) - 1 );
-	}
-	
-	public void dispose()
-	{
-		mSyncProcessors.clear();
-	}
-	
-	/**
-	 * Processes two bits before checking sync processors for a match.
-	 */
-	public void receive( boolean bit1, boolean bit2 )
-	{
-		mBits = Long.rotateLeft( mBits, 1 );
-		
-		mBits &= mMask;
-		
-		if( bit1 )
-		{
-			mBits += 1;
-		}
-
-		mBits = Long.rotateLeft( mBits, 1 );
-		
-		mBits &= mMask;
-		
-		if( bit2 )
-		{
-			mBits += 1;
-		}
-
-		for( ISyncProcessor processor: mSyncProcessors )
-		{
-			processor.checkSync( mBits );
-		}
-	}
-	
-	/**
-	 * Processes one bit before checking sync processors for a match.
-	 */
-	public void receive( boolean bit )
-	{
-		mBits = Long.rotateLeft( mBits, 1 );
-		
-		mBits &= mMask;
-		
-		if( bit )
-		{
-			mBits += 1;
-		}
-
-		for( ISyncProcessor processor: mSyncProcessors )
-		{
-			processor.checkSync( mBits );
-		}
-	}
-
-	/**
-	 * Adds a sync processor to receive the bit stream.
-	 */
-	public void add( ISyncProcessor processor )
-	{
-		mSyncProcessors.add( processor );
-	}
-}

src/bits/SoftSyncDetector.java

@@ -1,48 +0,0 @@
-package bits;
-
-public class SoftSyncDetector implements ISyncProcessor
-{
-	private ISyncDetectListener mListener;
-	private long mPattern;
-	private int mThreshold;
-	
-	public SoftSyncDetector( ISyncDetectListener listener, long pattern, int threshold )
-	{
-		this( pattern, threshold );
-		
-		mListener = listener;
-	}
-	
-	public SoftSyncDetector( long pattern, int threshold )
-	{
-		mPattern = pattern;
-		mThreshold = threshold;
-	}
-	
-	public void dispose()
-	{
-		mListener = null;
-	}
-
-	@Override
-	public void checkSync( long value )
-	{
-		long difference = value ^ mPattern;
-		
-		if( ( difference == 0 || Long.bitCount( difference ) <= mThreshold ) &&
-			  mListener != null )
-		{
-			mListener.syncDetected();
-		}
-	}
-	
-	public void setThreshold( int threshold )
-	{
-		mThreshold = threshold;
-	}
-	
-	public void setListener( ISyncDetectListener listener )
-	{
-		mListener = listener;
-	}
-}

src/bits/SyncDetector.java

@@ -1,33 +0,0 @@
-package bits;
-
-public class SyncDetector implements ISyncProcessor
-{
-	private long mPattern;
-	private ISyncDetectListener mListener;
-
-	public SyncDetector( long pattern )
-	{
-		mPattern = pattern;
-	}
-	
-	public SyncDetector( long pattern, ISyncDetectListener listener )
-	{
-		this( pattern );
-		
-		mListener = listener;
-	}
-	
-	public void setListener( ISyncDetectListener listener )
-	{
-		mListener = listener;
-	}
-
-	@Override
-	public void checkSync( long value )
-	{
-		if( value == mPattern && mListener != null )
-		{
-			mListener.syncDetected();
-		}
-	}
-}

src/bits/SyncPatternMatcher.java

@@ -1,132 +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 bits;
-
-
-/**
- * Sync pattern matcher.
- * 
- * Note: works for sync patterns up to 63 bits (integer size - 1 ) long.  
- * If a 64 bit or larger sync pattern is applied, then the wrapping feature
- * of the Long.rotate methods will wrap the MSB around to the LSB and
- * corrupt the matching value.
- *
- */
-public class SyncPatternMatcher
-{
-	private long mBits = 0;
-	private long mMask = 0;
-	private long mSync = 0;
-	private boolean mSoftMode = false;
-	private int mSoftModeErrorThreshold = 0;
-	
-	public SyncPatternMatcher( boolean[] syncPattern )
-	{
-		//Setup a bit mask of all ones the length of the sync pattern
-		mMask = (long)( ( Math.pow( 2, syncPattern.length ) ) - 1 );
-		
-		//Convert the sync bits into a long value for comparison
-		for( int x = 0; x < syncPattern.length; x++ )
-		{
-			if( syncPattern[ x ] )
-			{
-    			mSync += 1l << ( syncPattern.length - 1 - x );
-			}
-		}
-	}
-	
-	public SyncPatternMatcher( long sync )
-	{
-		mSync = sync;
-		mMask = getMask( sync );
-	}
-
-	/**
-	 * Constructs the sync pattern matcher and defines the soft mode maximum
-	 * number of bit errors to allow in the pattern match.
-	 * 
-	 * @param sync pattern
-	 * @param softModeErrorThreshold - maximum bit errors (ie pattern mismatch
-	 * positions) when considering a sync match
-	 */
-	public SyncPatternMatcher( long sync, int softModeErrorThreshold )
-	{
-		this( sync );
-		
-		mSoftModeErrorThreshold = softModeErrorThreshold;
-	}
-
-	/**
-	 * Generates an all ones mask corresponding to the sync pattern
-	 */
-	private static long getMask( long sync )
-	{
-		long mask = sync;
-		
-		for( int x = 1; x < 64; x *= 2 )
-		{
-			mask |= ( mask >> x );
-		}
-		
-		return mask;
-	}
-	
-	
-	public void receive( boolean bit )
-	{
-		//Left shift the previous value
-		mBits = Long.rotateLeft( mBits, 1 );
-		
-		//Apply the mask to erase the previous MSB
-		mBits &= mMask;
-		
-		//Add in the new bit
-		if( bit )
-		{
-			mBits += 1;
-		}
-	}
-
-	/**
-	 * Indicates if the most recently received bit sequence matches the 
-	 * sync pattern
-	 */
-	public boolean matches()
-	{
-		if( mSoftMode )
-		{
-			long difference = mBits ^ mSync;
-			
-			return difference == 0 || 
-					Long.bitCount( difference ) <= mSoftModeErrorThreshold;
-		}
-		else
-		{
-			return ( mBits == mSync );
-		}
-	}
-
-	/**
-	 * Sets the sync pattern matcher in soft mode which allows up to the soft
-	 * mode threshold number of bit errors when considering a sync pattern match
-	 */
-	public void setSoftMode( boolean softMode )
-	{
-		mSoftMode = softMode;
-	}
-}

src/buffer/BooleanAveragingBuffer.java

@@ -1,107 +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 Buffer - implements a circular buffer with a method to get the 
- * current head of the buffer, and put a new value in its place at the same
- * time
- * 
- * Also provides averaging over the elements in the buffer
- */
-public class BooleanAveragingBuffer {
-
-	private boolean[] mBuffer;
-	private int mBufferPointer;
-	
-	public BooleanAveragingBuffer( int length )
-	{
-		mBuffer = new boolean[ length ];
-		
-		//Preload the array with false values
-		Arrays.fill( mBuffer, false );
-	}
-	
-	public boolean get( boolean newValue )
-	{
-		//Fetch current boolean value
-		boolean retVal = mBuffer[ mBufferPointer ];
-
-		//Load the new value into the buffer
-		put( newValue );
-		
-		return retVal;
-	}
-
-	/**
-	 * Loads the newValue into this buffer and adjusts the buffer pointer
-	 * to prepare for the next get/put cycle
-	 */
-	private void put( boolean newValue )
-	{
-		//Store the new value to the buffer
-		mBuffer[ mBufferPointer ] = newValue;
-		
-		//Increment the buffer pointer
-		mBufferPointer++;
-
-		//Wrap the buffer pointer around to 0 when necessary
-		if( mBufferPointer >= mBuffer.length )
-		{
-			mBufferPointer = 0;
-		}
-	}
-
-	/**
-	 * Loads the newValue into the buffer, calculates the average
-	 * and returns that average from this method
-	 * 
-	 * This effectively performs low-pass filtering
-	 */
-	public boolean getAverage( boolean newValue )
-	{
-		//Load the new value into the buffer
-		put( newValue );
-		
-		int trueCount = 0;
-		
-		for( int x = 0; x < mBuffer.length; x++ )
-		{
-			if( mBuffer[ x ] )
-			{
-				trueCount++;
-			}
-		}
-
-		/**
-		 * If the number of true values in the buffer is 
-		 * more than half, return true, otherwise, false
-		 */
-		if( trueCount > (int)( mBuffer.length / 2 ) )
-		{
-			return true;
-		}
-		else
-		{
-			return false;
-		}
-	}
-}