Permalink
Browse files

Merge branch 'master' of github.com:alexlee188/ghpsdr3-alex

  • Loading branch information...
2 parents 18fd51a + c2c1b9a commit 30e936c83d998b75989f445109905bd8d7ff2b43 @amontefusco amontefusco committed Mar 21, 2013
Showing with 1,973 additions and 422 deletions.
  1. +20 −0 .gitignore
  2. +606 −86 branches/java/jmonitor/nbproject/build-impl.xml
  3. +2 −2 branches/java/jmonitor/nbproject/genfiles.properties
  4. +182 −32 branches/java/jmonitor/nbproject/jnlp-impl.xml
  5. +1 −0 branches/java/jmonitor/nbproject/private/config.properties
  6. +2 −2 branches/java/jmonitor/nbproject/private/private.properties
  7. +1 −0 branches/java/jmonitor/nbproject/private/private.xml
  8. +24 −8 branches/java/jmonitor/nbproject/project.properties
  9. +14 −2 branches/java/jmonitor/src/jmonitor/Audio.java
  10. +333 −63 branches/java/jmonitor/src/jmonitor/Client.java
  11. +118 −4 branches/java/jmonitor/src/jmonitor/ControlPanel.form
  12. +134 −20 branches/java/jmonitor/src/jmonitor/ControlPanel.java
  13. +11 −9 branches/java/jmonitor/src/jmonitor/DigitalMeter.java
  14. +22 −9 branches/java/jmonitor/src/jmonitor/Main.java
  15. +18 −12 branches/java/jmonitor/src/jmonitor/MonitorApplet.java
  16. +1 −1 branches/java/jmonitor/src/jmonitor/MonitorFrame.form
  17. +18 −14 branches/java/jmonitor/src/jmonitor/MonitorFrame.java
  18. +20 −13 branches/java/jmonitor/src/jmonitor/MonitorPanel.java
  19. +18 −3 branches/java/jmonitor/src/jmonitor/MonitorUpdateListener.java
  20. +15 −6 branches/java/jmonitor/src/jmonitor/MonitorUpdateThread.java
  21. +44 −17 branches/java/jmonitor/src/jmonitor/SpectrumPanel.java
  22. +109 −28 branches/java/jmonitor/src/jmonitor/WaterfallPanel.java
  23. +3 −8 trunk/src/QtRadio/Connection.cpp
  24. +1 −1 trunk/src/QtRadio/ctl.cpp
  25. +17 −19 trunk/src/dspserver/client.c
  26. +67 −0 trunk/src/hiqsdr/README_GJ
  27. +104 −50 trunk/src/hiqsdr/hiqsdr.cpp
  28. +1 −0 trunk/src/hiqsdr/hiqsdr.h
  29. +54 −10 trunk/src/perseus/configure.ac
  30. +2 −1 trunk/src/rtlsdr/client.cpp
  31. +1 −1 trunk/src/rtlsdr/receiver.cpp
  32. +10 −1 trunk/src/rtlsdr/server.cpp
View
@@ -70,4 +70,24 @@ trunk/src/hiqsdr/hiqsdr-test
trunk/src/sdriq/sdriq-server
trunk/src/sdriq/sdriq-test
branches/android/aHPSDR/bin/*
+build-aux/libtool.m4
+build-aux/ltoptions.m4
+build-aux/ltsugar.m4
+build-aux/ltversion.m4
+build-aux/lt~obsolete.m4
+libtool
+ltmain.sh
+trunk/src/rtlsdr/build-aux/libtool.m4
+trunk/src/rtlsdr/build-aux/ltoptions.m4
+trunk/src/rtlsdr/build-aux/ltsugar.m4
+trunk/src/rtlsdr/build-aux/ltversion.m4
+trunk/src/rtlsdr/build-aux/lt~obsolete.m4
+trunk/src/rtlsdr/ltmain.sh
+trunk/src/usrp/build-aux/libtool.m4
+trunk/src/usrp/build-aux/ltoptions.m4
+trunk/src/usrp/build-aux/ltsugar.m4
+trunk/src/usrp/build-aux/ltversion.m4
+trunk/src/usrp/build-aux/lt~obsolete.m4
+trunk/src/usrp/ltmain.sh
+

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -4,5 +4,5 @@ build.xml.stylesheet.CRC32=28e38971@1.38.2.45
# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
nbproject/build-impl.xml.data.CRC32=c5a11278
-nbproject/build-impl.xml.script.CRC32=b160b718
-nbproject/build-impl.xml.stylesheet.CRC32=f33e10ff@1.38.2.45
+nbproject/build-impl.xml.script.CRC32=ad63cc60
+nbproject/build-impl.xml.stylesheet.CRC32=c6d2a60f@1.55.1.46

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -0,0 +1 @@
+config=JWS_generated
@@ -1,6 +1,6 @@
compile.on.save=true
-do.depend=false
+do.depend=true
do.jar=true
javac.debug=true
javadoc.preview=true
-user.properties.file=/home/dlarsen/.netbeans/6.8/build.properties
+user.properties.file=/home/alex/.netbeans/7.3beta2/build.properties
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<project-private xmlns="http://www.netbeans.org/ns/project-private/1">
<editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/1"/>
+ <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/>
</project-private>
@@ -1,8 +1,12 @@
+annotation.processing.enabled=true
+annotation.processing.enabled.in.editor=false
+annotation.processing.processors.list=
+annotation.processing.run.all.processors=true
ant.customtasks.libs=JWSAntTasks
-application.desc=HPSDR Java remote radio
-application.homepage=http;//g0orx.homelinux.net
+application.desc=This is an updated version of the Java release from John Melton. The updates\ninclude colorization of waterfall, Master/Slave operation, similar to QtRadio
+application.homepage=http://www.n8mdp.com
application.title=JMonitor
-application.vendor=John Melton g0orx/n6lyt
+application.vendor=John Melton g0orx/n6lyt, Updated by John Tucker N8MDP
build.classes.dir=${build.dir}/classes
build.classes.excludes=**/*.java,**/*.form
# This directory is removed when the project is cleaned:
@@ -23,14 +27,21 @@ debug.test.classpath=\
dist.dir=dist
dist.jar=${dist.dir}/jmonitor.jar
dist.javadoc.dir=${dist.dir}/javadoc
+endorsed.classpath=\
+ ${jdk.home}/jre/lib/javaws.jar:\
+ ${jdk.home}/jre/lib/plugin.jar
excludes=
includes=**
+jar.archive.disabled=${jnlp.enabled}
jar.compress=false
+jar.index=${jnlp.enabled}
javac.classpath=\
${libs.absolutelayout.classpath}
# Space-separated list of extra javac options
javac.compilerargs=
javac.deprecation=false
+javac.processorpath=\
+ ${javac.classpath}
javac.source=1.5
javac.target=1.5
javac.test.classpath=\
@@ -52,16 +63,21 @@ javadoc.windowtitle=
jnlp.applet.class=jmonitor.MonitorApplet
jnlp.applet.height=230
jnlp.applet.width=480
-jnlp.codebase.type=local
-jnlp.codebase.url=file:/home/john/N6LYT/ghpsdr3/branches/java/jmonitor/dist/
-jnlp.codebase.user=http://g0orx.homelinux.net/
+jnlp.codebase.type=user
+jnlp.codebase.url=$$$$codebase
+jnlp.codebase.user=http://n8mdp.dyndns.org/n8mdpASP/jmonitorN8MDP
jnlp.descriptor=applet
-jnlp.enabled=false
-jnlp.offline-allowed=true
+jnlp.enabled=true
+jnlp.mixed.code=default
+jnlp.offline-allowed=false
jnlp.signed=true
+jnlp.signing=generated
+jnlp.signing.alias=jmonitor
+jnlp.signing.keystore=
main.class=jmonitor.Main
manifest.file=manifest.mf
meta.inf.dir=${src.dir}/META-INF
+mkdist.disabled=false
platform.active=default_platform
run.classpath=\
${javac.classpath}:\
@@ -1,6 +1,18 @@
/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
+ * Audio.java
+ * Created by John Melton G0ORX
+ *
+ */
+
+/*
+ * This code has been and reviewed modified.
+ * John Tucker, N8MDP
+ */
+
+/*
+ * Revsion History
+ * 01/20/13: No Change
+ *
*/
package jmonitor;
Oops, something went wrong.

0 comments on commit 30e936c

Please sign in to comment.