Merge pull request #4 from praxis-live/develop

Merge develop to master for v3.1.0 release

.gitignore

@@ -1,154 +1,160 @@
-/nbproject/private/
-/lib.netutil/build/
-/lib.tinkerforge/build/
-/build/
-/lib.miglayout/build/
-/praxis.core/build/
-/praxis.audio.loader/build/
-/praxis.laf/build/
-/praxis.nb.lookup/build/
-/praxis.meta/build/
-/praxis.settings/build/
-/praxis.swing/build/
-/praxis.util/build/
-/praxis.impl/build/
-/praxis.tinkerforge/build/
-/praxis.hub/build/
-/praxis.osc/build/
-/praxis.script/build/
-/praxis.gui/build/
-/praxis.components/build/
-/praxis.midi/build/
-/praxis.video/build/
-/praxis.video.render/build/
-/praxis.video.pipes/build/
-/praxis.video.software/build/
-/lib.janino/build/
-/praxis.java/build/
-/praxis.video.java/build/
-/lib.rsyntaxtextarea/build/
-/praxis.texteditor/build/
-/audio.ops/build/
-/praxis.terminal/build/
-/praxis.player/build/
-/audio.ops.impl/build/
-/lib.lwjgl/build/
-/audio.ops.gpl/build/
-/audio.pipes/build/
-/audio.servers/build/
-/audio.servers.javasound/build/
-/praxis.video.opengl/build/
-/lib.jna/build/
-/audio.servers.jack/build/
-/praxis.audio/build/
-/audio.jnajack/build/
-/lib.gstreamer-java/build/
-/praxis.video.gstreamer/build/
-/praxis.video.gstreamer-osx/build/
-/praxis.video.gstreamer-win/build/
-/praxis.laf/nbproject/private/
-/praxis.hub/nbproject/private/
-/lib.tinkerforge/nbproject/private/
-/praxis.video/nbproject/private/
-/praxis.midi/nbproject/private/
-/audio.servers.javasound/nbproject/private/
-/lib.rsyntaxtextarea/nbproject/private/
-/praxis.gui/nbproject/private/
-/praxis.audio/nbproject/private/
-/praxis.video.pipes/nbproject/private/
-/praxis.video.render/nbproject/private/
-/praxis.java/nbproject/private/
-/lib.janino/nbproject/private/
-/praxis.util/nbproject/private/
-/praxis.video.opengl/nbproject/private/
-/praxis.impl/nbproject/private/
-/audio.pipes/nbproject/private/
-/lib.lwjgl/nbproject/private/
-/audio.servers.jack/nbproject/private/
-/praxis.audio.loader/nbproject/private/
-/praxis.osc/nbproject/private/
-/audio.ops.gpl/nbproject/private/
-/lib.gstreamer-java/nbproject/private/
-/audio.jnajack/nbproject/private/
-/praxis.player/nbproject/private/
-/praxis.video.gstreamer/nbproject/private/
-/praxis.video.java/nbproject/private/
-/audio.ops/nbproject/private/
-/praxis.script/nbproject/private/
-/praxis.video.gstreamer-win/nbproject/private/
-/praxis.video.software/nbproject/private/
-/lib.miglayout/nbproject/private/
-/praxis.texteditor/nbproject/private/
-/lib.jna/nbproject/private/
-/audio.ops.impl/nbproject/private/
-/praxis.tinkerforge/nbproject/private/
-/lib.netutil/nbproject/private/
-/praxis.settings/nbproject/private/
-/praxis.components/nbproject/private/
-/praxis.nb.lookup/nbproject/private/
-/praxis.terminal/nbproject/private/
-/audio.servers/nbproject/private/
-/praxis.core/nbproject/private/
-/praxis.swing/nbproject/private/
-/praxis.meta/nbproject/private/
-/praxis.video.gstreamer-osx/nbproject/private/
-/lib.commons-compiler/build/
-/lib.compiler.pjc/build/
-/lib.compiler/build/
-/lib.commons-compiler/nbproject/private/
-/lib.compiler/nbproject/private/
-/lib.compiler.pjc/nbproject/private/
-/praxis.nb.classpath/build/
-/praxis.nb.classpath/nbproject/private/
-/praxis.compiler/nbproject/private/
-/lib.janino.commons/build/
-/praxis.compiler.javac/build/
-/praxis.compiler/build/
-/praxis.compiler.javac/nbproject/private/
-/lib.janino.commons/nbproject/private/
-/praxis.logging/nbproject/private/
-/praxis.logging/build/
-/lib.jogl/build/
-/lib.processing/build/
-/lib.jogl/nbproject/private/
-/lib.processing/nbproject/private/
-/praxis.video.pgl/nbproject/private/
-/praxis.video.pgl/build/
-/dist/
-/praxis.code/build/
-/praxis.code/nbproject/private/
-/praxis.video.code/build/
-/praxis.video.code/nbproject/private/
-/praxis.video.pgl.custom/build/
-/praxis.video.pgl.code/build/
-/praxis.video.pgl.code/nbproject/private/
-/praxis.hub.net/build/
-/praxis.hub.net/nbproject/private/
-/praxis.core.components/build/
-/praxis.core.components/nbproject/private/
-/praxis.core.factory/build/
-/praxis.video.factory/build/
-/praxis.core.factory/nbproject/private/
-/praxis.video.factory/nbproject/private/
-/praxis.video.gstreamer-osx/release/modules/lib/macosx64/
-/praxis.video.gstreamer-win/release/modules/lib/windows32/
-/praxis.video.gstreamer-win/release/modules/lib/windows64/
-/praxis.core.code/build/
-/praxis.core.code/nbproject/private/
-/praxis.audio.code/build/
-/praxis.audio.factory/build/
-/praxis.audio.factory/nbproject/private/
-/praxis.tracker/build/
-/praxis.audio.code/nbproject/private/
-/praxis.tracker/nbproject/private/
-/praxis.video.gst1/build/
-/lib.gst1-java-core/build/
-/lib.gst1-java-core/nbproject/private/
-/praxis.video.gst1/nbproject/private/
-/praxis.code.services/build/
-/praxis.code.services/nbproject/private/
-/lib.darcula/build/
-/lib.nanohttpd/build/
-/praxis.data/build/
-/praxis.data/nbproject/private/
-/lib.jna.platform/build/
+/nbproject/private/
+/lib.netutil/build/
+/lib.tinkerforge/build/
+/build/
+/lib.miglayout/build/
+/praxis.core/build/
+/praxis.audio.loader/build/
+/praxis.laf/build/
+/praxis.nb.lookup/build/
+/praxis.meta/build/
+/praxis.settings/build/
+/praxis.swing/build/
+/praxis.util/build/
+/praxis.impl/build/
+/praxis.tinkerforge/build/
+/praxis.hub/build/
+/praxis.osc/build/
+/praxis.script/build/
+/praxis.gui/build/
+/praxis.components/build/
+/praxis.midi/build/
+/praxis.video/build/
+/praxis.video.render/build/
+/praxis.video.pipes/build/
+/praxis.video.software/build/
+/lib.janino/build/
+/praxis.java/build/
+/praxis.video.java/build/
+/lib.rsyntaxtextarea/build/
+/praxis.texteditor/build/
+/audio.ops/build/
+/praxis.terminal/build/
+/praxis.player/build/
+/audio.ops.impl/build/
+/lib.lwjgl/build/
+/audio.ops.gpl/build/
+/audio.pipes/build/
+/audio.servers/build/
+/audio.servers.javasound/build/
+/praxis.video.opengl/build/
+/lib.jna/build/
+/audio.servers.jack/build/
+/praxis.audio/build/
+/audio.jnajack/build/
+/lib.gstreamer-java/build/
+/praxis.video.gstreamer/build/
+/praxis.video.gstreamer-osx/build/
+/praxis.video.gstreamer-win/build/
+/praxis.laf/nbproject/private/
+/praxis.hub/nbproject/private/
+/lib.tinkerforge/nbproject/private/
+/praxis.video/nbproject/private/
+/praxis.midi/nbproject/private/
+/audio.servers.javasound/nbproject/private/
+/lib.rsyntaxtextarea/nbproject/private/
+/praxis.gui/nbproject/private/
+/praxis.audio/nbproject/private/
+/praxis.video.pipes/nbproject/private/
+/praxis.video.render/nbproject/private/
+/praxis.java/nbproject/private/
+/lib.janino/nbproject/private/
+/praxis.util/nbproject/private/
+/praxis.video.opengl/nbproject/private/
+/praxis.impl/nbproject/private/
+/audio.pipes/nbproject/private/
+/lib.lwjgl/nbproject/private/
+/audio.servers.jack/nbproject/private/
+/praxis.audio.loader/nbproject/private/
+/praxis.osc/nbproject/private/
+/audio.ops.gpl/nbproject/private/
+/lib.gstreamer-java/nbproject/private/
+/audio.jnajack/nbproject/private/
+/praxis.player/nbproject/private/
+/praxis.video.gstreamer/nbproject/private/
+/praxis.video.java/nbproject/private/
+/audio.ops/nbproject/private/
+/praxis.script/nbproject/private/
+/praxis.video.gstreamer-win/nbproject/private/
+/praxis.video.software/nbproject/private/
+/lib.miglayout/nbproject/private/
+/praxis.texteditor/nbproject/private/
+/lib.jna/nbproject/private/
+/audio.ops.impl/nbproject/private/
+/praxis.tinkerforge/nbproject/private/
+/lib.netutil/nbproject/private/
+/praxis.settings/nbproject/private/
+/praxis.components/nbproject/private/
+/praxis.nb.lookup/nbproject/private/
+/praxis.terminal/nbproject/private/
+/audio.servers/nbproject/private/
+/praxis.core/nbproject/private/
+/praxis.swing/nbproject/private/
+/praxis.meta/nbproject/private/
+/praxis.video.gstreamer-osx/nbproject/private/
+/lib.commons-compiler/build/
+/lib.compiler.pjc/build/
+/lib.compiler/build/
+/lib.commons-compiler/nbproject/private/
+/lib.compiler/nbproject/private/
+/lib.compiler.pjc/nbproject/private/
+/praxis.nb.classpath/build/
+/praxis.nb.classpath/nbproject/private/
+/praxis.compiler/nbproject/private/
+/lib.janino.commons/build/
+/praxis.compiler.javac/build/
+/praxis.compiler/build/
+/praxis.compiler.javac/nbproject/private/
+/lib.janino.commons/nbproject/private/
+/praxis.logging/nbproject/private/
+/praxis.logging/build/
+/lib.jogl/build/
+/lib.processing/build/
+/lib.jogl/nbproject/private/
+/lib.processing/nbproject/private/
+/praxis.video.pgl/nbproject/private/
+/praxis.video.pgl/build/
+/dist/
+/praxis.code/build/
+/praxis.code/nbproject/private/
+/praxis.video.code/build/
+/praxis.video.code/nbproject/private/
+/praxis.video.pgl.custom/build/
+/praxis.video.pgl.code/build/
+/praxis.video.pgl.code/nbproject/private/
+/praxis.hub.net/build/
+/praxis.hub.net/nbproject/private/
+/praxis.core.components/build/
+/praxis.core.components/nbproject/private/
+/praxis.core.factory/build/
+/praxis.video.factory/build/
+/praxis.core.factory/nbproject/private/
+/praxis.video.factory/nbproject/private/
+/praxis.video.gstreamer-osx/release/modules/lib/macosx64/
+/praxis.video.gstreamer-win/release/modules/lib/windows32/
+/praxis.video.gstreamer-win/release/modules/lib/windows64/
+/praxis.core.code/build/
+/praxis.core.code/nbproject/private/
+/praxis.audio.code/build/
+/praxis.audio.factory/build/
+/praxis.audio.factory/nbproject/private/
+/praxis.tracker/build/
+/praxis.audio.code/nbproject/private/
+/praxis.tracker/nbproject/private/
+/praxis.video.gst1/build/
+/lib.gst1-java-core/build/
+/lib.gst1-java-core/nbproject/private/
+/praxis.video.gst1/nbproject/private/
+/praxis.code.services/build/
+/praxis.code.services/nbproject/private/
+/lib.darcula/build/
+/lib.nanohttpd/build/
+/praxis.data/build/
+/praxis.data/nbproject/private/
+/lib.jna.platform/build/
+/lib.syphon/build/
+/praxis.video.pgl.syphon/build/
+/praxis.video.pgl.syphon/nbproject/private/
+/praxis.video.pgl.spout/build/
+/lib.spout/build/
+/praxis.video.pgl.spout/nbproject/private/

lib.gst1-java-core/manifest.mf

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 AutoUpdate-Show-In-Client: true
 OpenIDE-Module: org.freedesktop.gstreamer
 OpenIDE-Module-Localizing-Bundle: org/freedesktop/gstreamer/Bundle.properties
-OpenIDE-Module-Specification-Version: 0.9.160303
+OpenIDE-Module-Specification-Version: 0.9.161201
 

lib.gst1-java-core/nbproject/genfiles.properties

@@ -1,8 +1,8 @@
-build.xml.data.CRC32=47d0585a
+build.xml.data.CRC32=901b2e09
 build.xml.script.CRC32=71534ec1
-build.xml.stylesheet.CRC32=a56c6a5b@2.67.1
+build.xml.stylesheet.CRC32=a56c6a5b@2.71.1
 # 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=47d0585a
+nbproject/build-impl.xml.data.CRC32=901b2e09
 nbproject/build-impl.xml.script.CRC32=0556a71e
-nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.67.1
+nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.71.1

lib.gst1-java-core/nbproject/project.properties

@@ -1,4 +1,4 @@
-file.reference.gst1-java-core-0.9-160303.jar=release/modules/ext/gst1-java-core-0.9-160303.jar
+file.reference.gst1-java-core-0.9-161201.jar=release/modules/ext/gst1-java-core-0.9-161201.jar
 is.autoload=true
 javac.compilerargs=-Xlint -Xlint:-serial
 javac.source=1.8

lib.gst1-java-core/nbproject/project.xml

@@ -29,8 +29,8 @@
                 <package>org.freedesktop.gstreamer.query</package>
             </public-packages>
             <class-path-extension>
-                <runtime-relative-path>ext/gst1-java-core-0.9-160303.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/gst1-java-core-0.9-160303.jar</binary-origin>
+                <runtime-relative-path>ext/gst1-java-core-0.9-161201.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/gst1-java-core-0.9-161201.jar</binary-origin>
             </class-path-extension>
         </data>
     </configuration>

lib.processing/manifest.mf

@@ -1,5 +1,5 @@
 Manifest-Version: 1.0
 OpenIDE-Module: processing.core
 OpenIDE-Module-Localizing-Bundle: processing/core/Bundle.properties
-OpenIDE-Module-Specification-Version: 3.0.1
+OpenIDE-Module-Specification-Version: 3.2.3
 

lib.processing/nbproject/genfiles.properties

@@ -1,8 +1,8 @@
-build.xml.data.CRC32=0a597dde
+build.xml.data.CRC32=455094f1
 build.xml.script.CRC32=5af10cd5
-build.xml.stylesheet.CRC32=a56c6a5b@2.67.1
+build.xml.stylesheet.CRC32=a56c6a5b@2.71.1
 # 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=0a597dde
+nbproject/build-impl.xml.data.CRC32=455094f1
 nbproject/build-impl.xml.script.CRC32=c2c5dd3f
-nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.67.1
+nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.71.1

lib.processing/nbproject/project.xml

@@ -15,15 +15,12 @@
                     </run-dependency>
                 </dependency>
             </module-dependencies>
-            <friend-packages>
-                <friend>net.neilcsmith.praxis.code</friend>
-                <friend>net.neilcsmith.praxis.video.pgl</friend>
-                <friend>net.neilcsmith.praxis.video.pgl.code</friend>
+            <public-packages>
                 <package>processing.core</package>
                 <package>processing.data</package>
                 <package>processing.event</package>
                 <package>processing.opengl</package>
-            </friend-packages>
+            </public-packages>
             <class-path-extension>
                 <runtime-relative-path>ext/core.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/core.jar</binary-origin>