Merge pull request #13 from praxis-live/develop

Merge develop to master for v4.2.0 release

lib.gst1-java-core/manifest.mf

@@ -2,4 +2,4 @@ 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.3
+OpenIDE-Module-Specification-Version: 1.0.0

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

@@ -1,8 +1,8 @@
-build.xml.data.CRC32=e23eb028
+build.xml.data.CRC32=70002b55
 build.xml.script.CRC32=71534ec1
 build.xml.stylesheet.CRC32=[email protected]
 # 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=e23eb028
+nbproject/build-impl.xml.data.CRC32=70002b55
 nbproject/build-impl.xml.script.CRC32=0556a71e
 nbproject/build-impl.xml.stylesheet.CRC32=[email protected]

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

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

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

@@ -11,27 +11,24 @@
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <specification-version>4.5.1</specification-version>
+                        <specification-version>5.2.0</specification-version>
                     </run-dependency>
                 </dependency>
             </module-dependencies>
             <public-packages>
                 <package>org.freedesktop.gstreamer</package>
-                <package>org.freedesktop.gstreamer.controller</package>
                 <package>org.freedesktop.gstreamer.device</package>
                 <package>org.freedesktop.gstreamer.elements</package>
                 <package>org.freedesktop.gstreamer.event</package>
                 <package>org.freedesktop.gstreamer.glib</package>
                 <package>org.freedesktop.gstreamer.interfaces</package>
-                <package>org.freedesktop.gstreamer.io</package>
-                <package>org.freedesktop.gstreamer.lowlevel</package>
-                <package>org.freedesktop.gstreamer.lowlevel.annotations</package>
                 <package>org.freedesktop.gstreamer.message</package>
                 <package>org.freedesktop.gstreamer.query</package>
+                <package>org.freedesktop.gstreamer.webrtc</package>
             </public-packages>
             <class-path-extension>
-                <runtime-relative-path>ext/gst1-java-core-0.9.3.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/gst1-java-core-0.9.3.jar</binary-origin>
+                <runtime-relative-path>ext/gst1-java-core-1.0.0-beta-2.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/gst1-java-core-1.0.0-beta-2.jar</binary-origin>
             </class-path-extension>
         </data>
     </configuration>

lib.jna.platform/manifest.mf

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 AutoUpdate-Show-In-Client: true
 OpenIDE-Module: com.sun.jna.platform
 OpenIDE-Module-Localizing-Bundle: com/sun/jna/platform/Bundle.properties
-OpenIDE-Module-Specification-Version: 4.5.1
+OpenIDE-Module-Specification-Version: 5.2.0
 

lib.jna.platform/nbproject/genfiles.properties

@@ -1,8 +1,8 @@
-build.xml.data.CRC32=64a22786
+build.xml.data.CRC32=dd2d62f7
 build.xml.script.CRC32=c08ae6e9
 build.xml.stylesheet.CRC32=[email protected]
 # 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=64a22786
+nbproject/build-impl.xml.data.CRC32=dd2d62f7
 nbproject/build-impl.xml.script.CRC32=a5bb51d6
 nbproject/build-impl.xml.stylesheet.CRC32=[email protected]

lib.jna.platform/nbproject/project.properties

@@ -1,4 +1,3 @@
-file.reference.jna-platform-4.5.1.jar=release/modules/ext/jna-platform-4.5.1.jar
 is.autoload=true
 javac.compilerargs=-Xlint -Xlint:-serial
 javac.source=1.8

lib.jna.platform/nbproject/project.xml

@@ -11,7 +11,7 @@
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <specification-version>4.5.1</specification-version>
+                        <specification-version>5.2.0</specification-version>
                     </run-dependency>
                 </dependency>
             </module-dependencies>
@@ -30,8 +30,8 @@
                 <package>com.sun.jna.platform.wince</package>
             </public-packages>
             <class-path-extension>
-                <runtime-relative-path>ext/jna-platform-4.5.1.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/jna-platform-4.5.1.jar</binary-origin>
+                <runtime-relative-path>ext/jna-platform-5.2.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jna-platform-5.2.0.jar</binary-origin>
             </class-path-extension>
         </data>
     </configuration>

lib.jna/manifest.mf

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 OpenIDE-Module: com.sun.jna
 OpenIDE-Module-Install: com/sun/jna/praxis/Installer.class
 OpenIDE-Module-Localizing-Bundle: com/sun/jna/Bundle.properties
-OpenIDE-Module-Specification-Version: 4.5.1
+OpenIDE-Module-Specification-Version: 5.2.0
 AutoUpdate-Essential-Module: true
 AutoUpdate-Show-In-Client: false
 

lib.jna/nbproject/genfiles.properties

@@ -1,8 +1,8 @@
-build.xml.data.CRC32=a6f9b470
+build.xml.data.CRC32=8ae1fe90
 build.xml.script.CRC32=85731d8a
 build.xml.stylesheet.CRC32=[email protected]
 # 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=a6f9b470
+nbproject/build-impl.xml.data.CRC32=8ae1fe90
 nbproject/build-impl.xml.script.CRC32=bada43ba
 nbproject/build-impl.xml.stylesheet.CRC32=[email protected]

lib.jna/nbproject/project.xml

@@ -29,8 +29,8 @@
                 <package>com.sun.jna.win32</package>
             </public-packages>
             <class-path-extension>
-                <runtime-relative-path>ext/jna-4.5.1.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/jna-4.5.1.jar</binary-origin>
+                <runtime-relative-path>ext/jna-5.2.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jna-5.2.0.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.4.0
+OpenIDE-Module-Specification-Version: 3.5.3
 

lib.tinkerforge/manifest.mf

@@ -1,5 +1,5 @@
 Manifest-Version: 1.0
 OpenIDE-Module: com.tinkerforge
 OpenIDE-Module-Localizing-Bundle: com/tinkerforge/Bundle.properties
-OpenIDE-Module-Specification-Version: 2.1.16
+OpenIDE-Module-Specification-Version: 2.1.22
 

nbproject/project.properties

@@ -2,7 +2,7 @@ app.icon=branding/core/core.jar/org/netbeans/core/startup/frame48.gif
 app.name=${branding.token}
 app.title=praxis
 app.conf=praxis.conf
-app.version=4.1.1
+app.version=4.2.0
 auxiliary.org-netbeans-modules-apisupport-installer.license-type=no
 auxiliary.org-netbeans-modules-apisupport-installer.os-linux=true
 auxiliary.org-netbeans-modules-apisupport-installer.os-macosx=false

praxis.code/src/org/praxislive/code/userapi/AbstractLinkable.java

@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright 2018 Neil C Smith.
+ * Copyright 2019 Neil C Smith.
  *
  * This code is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License version 3 only, as
@@ -32,14 +32,14 @@
  * @author Neil C Smith (http://neilcsmith.net)
  */
 abstract class AbstractLinkable<IN, OUT> implements Consumer<IN>, Linkable<OUT> {
-    
+
     private final Linkable<IN> source;
     private Consumer<OUT> sink;
-    
+
     AbstractLinkable(Linkable<IN> source) {
         this.source = Objects.requireNonNull(source);
     }
-    
+
     @Override
     public void accept(IN value) {
         process(value, sink);
@@ -50,16 +50,64 @@ public void link(Consumer<OUT> consumer) {
         this.sink = Objects.requireNonNull(consumer);
         source.link(this);
     }
-    
+
     abstract void process(IN value, Consumer<OUT> sink);
+
+    abstract static class ToDouble<IN> implements Consumer<IN>, Linkable.Double {
+
+        private final Linkable<IN> source;
+        private DoubleConsumer sink;
+
+        ToDouble(Linkable<IN> source) {
+            this.source = Objects.requireNonNull(source);
+        }
+
+        @Override
+        public void accept(IN value) {
+            process(value, sink);
+        }
+
+        @Override
+        public void link(DoubleConsumer consumer) {
+            this.sink = Objects.requireNonNull(consumer);
+            source.link(this);
+        }
+
+        abstract void process(IN value, DoubleConsumer sink);
+
+    }
 
-    abstract static class Double implements DoubleConsumer, Linkable.Double {
+    abstract static class ToInt<IN> implements Consumer<IN>, Linkable.Int {
+
+        private final Linkable<IN> source;
+        private IntConsumer sink;
+
+        ToInt(Linkable<IN> source) {
+            this.source = Objects.requireNonNull(source);
+        }
+
+        @Override
+        public void accept(IN value) {
+            process(value, sink);
+        }
+
+        @Override
+        public void link(IntConsumer consumer) {
+            this.sink = Objects.requireNonNull(consumer);
+            source.link(this);
+        }
+
+        abstract void process(IN value, IntConsumer sink);
 
+    }
+
+    abstract static class Double implements DoubleConsumer, Linkable.Double {
+
         private final Linkable.Double source;
         private DoubleConsumer sink;
-        
+
         Double(Linkable.Double source) {
-            this.source = source;
+            this.source = Objects.requireNonNull(source);
         }
 
         @Override
@@ -69,21 +117,45 @@ public void accept(double value) {
 
         @Override
         public void link(DoubleConsumer consumer) {
-            this.sink = consumer;
+            this.sink = Objects.requireNonNull(consumer);
             source.link(this);
         }
-        
+
         abstract void process(double value, DoubleConsumer sink);
-        
+
     }
-
+
+    abstract static class DoubleToObj<OUT> implements DoubleConsumer, Linkable<OUT> {
+
+        private final Linkable.Double source;
+        private Consumer<OUT> sink;
+
+        DoubleToObj(Linkable.Double source) {
+            this.source = Objects.requireNonNull(source);
+        }
+
+        @Override
+        public void accept(double value) {
+            process(value, sink);
+        }
+
+        @Override
+        public void link(Consumer<OUT> consumer) {
+            this.sink = Objects.requireNonNull(consumer);
+            source.link(this);
+        }
+
+        abstract void process(double value, Consumer<OUT> sink);
+
+    }
+
     abstract static class Int implements IntConsumer, Linkable.Int {
-        
+
         private final Linkable.Int source;
         private IntConsumer sink;
-        
+
         Int(Linkable.Int source) {
-            this.source = source;
+            this.source = Objects.requireNonNull(source);
         }
 
         @Override
@@ -93,12 +165,36 @@ public void accept(int value) {
 
         @Override
         public void link(IntConsumer consumer) {
-            this.sink = consumer;
+            this.sink = Objects.requireNonNull(consumer);
             source.link(this);
         }
-        
+
         abstract void process(int value, IntConsumer sink);
-        
+
     }
-
+
+    abstract static class IntToObj<OUT> implements IntConsumer, Linkable<OUT> {
+
+        private final Linkable.Int source;
+        private Consumer<OUT> sink;
+
+        IntToObj(Linkable.Int source) {
+            this.source = Objects.requireNonNull(source);
+        }
+
+        @Override
+        public void accept(int value) {
+            process(value, sink);
+        }
+
+        @Override
+        public void link(Consumer<OUT> consumer) {
+            this.sink = Objects.requireNonNull(consumer);
+            source.link(this);
+        }
+
+        abstract void process(int value, Consumer<OUT> sink);
+
+    }
+
 }