From fcf93732757759f7a3a705b7903501ee3d1ce856 Mon Sep 17 00:00:00 2001 From: Josh Ziegler Date: Tue, 26 Nov 2019 22:18:32 -0500 Subject: [PATCH] Rename native library and re-case "Spokestack" --- README.md | 12 ++++++++++++ jni/Dev.mk | 8 ++++---- .../spokestack/spokestack/OnSpeechEventListener.java | 2 +- .../java/io/spokestack/spokestack/SpeechContext.java | 2 +- .../java/io/spokestack/spokestack/SpeechInput.java | 2 +- .../io/spokestack/spokestack/SpeechPipeline.java | 4 ++-- .../spokestack/microsoft/BingSpeechRecognizer.java | 4 ++-- .../java/io/spokestack/spokestack/package-info.java | 2 +- .../spokestack/webrtc/AcousticNoiseSuppressor.java | 2 +- .../spokestack/webrtc/AutomaticGainControl.java | 2 +- .../spokestack/webrtc/VoiceActivityDetector.java | 2 +- 11 files changed, 27 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index 7e0e27d..e8ef23f 100644 --- a/README.md +++ b/README.md @@ -103,6 +103,18 @@ mvn checkstyle:check ``` ### Release +Ensure that your Bintray credentials are in your user Maven `settings.xml`: + +```xml + + + bintray-spokestack-io.spokestack + username + bintray_api_key + + +``` + On a non-master branch, remove the -SNAPSHOT suffix from the version in `pom.xml`, then run the following command. This will deploy the package to Bintray and JCenter. diff --git a/jni/Dev.mk b/jni/Dev.mk index 02ef920..13f0ee3 100644 --- a/jni/Dev.mk +++ b/jni/Dev.mk @@ -4,15 +4,15 @@ CFLAGS = -shared -Wall -O3 -fpic \ -I$(JAVA_HOME)/include/$(shell uname | tr A-Z a-z) OUTDIR = ../target -all: $(OUTDIR)/libspokestack.jnilib +all: $(OUTDIR)/libspokestack-android.jnilib clean: - $(RM) $(OUTDIR)/libspokestack.jnilib - $(RM) $(OUTDIR)/libspokestack.so + $(RM) $(OUTDIR)/libspokestack-android.jnilib + $(RM) $(OUTDIR)/libspokestack-android.so rebuild: clean all -$(OUTDIR)/libspokestack.so: \ +$(OUTDIR)/libspokestack-android.so: \ agc.cpp \ vad.cpp \ ans.cpp \ diff --git a/src/main/java/io/spokestack/spokestack/OnSpeechEventListener.java b/src/main/java/io/spokestack/spokestack/OnSpeechEventListener.java index 39e529a..dc982a9 100644 --- a/src/main/java/io/spokestack/spokestack/OnSpeechEventListener.java +++ b/src/main/java/io/spokestack/spokestack/OnSpeechEventListener.java @@ -3,7 +3,7 @@ /** * speech event callback interface. * - * This is the primary event interface in SpokeStack. The speech pipeline + * This is the primary event interface in Spokestack. The speech pipeline * routes events/errors asynchronously through it as they occur. */ public interface OnSpeechEventListener { diff --git a/src/main/java/io/spokestack/spokestack/SpeechContext.java b/src/main/java/io/spokestack/spokestack/SpeechContext.java index 6598b50..307d4fa 100644 --- a/src/main/java/io/spokestack/spokestack/SpeechContext.java +++ b/src/main/java/io/spokestack/spokestack/SpeechContext.java @@ -6,7 +6,7 @@ import java.nio.ByteBuffer; /** - * SpokeStack speech recognition context + * Spokestack speech recognition context * *

* This class maintains global state for the speech pipeline, allowing diff --git a/src/main/java/io/spokestack/spokestack/SpeechInput.java b/src/main/java/io/spokestack/spokestack/SpeechInput.java index 8deb1e5..34d1f1b 100644 --- a/src/main/java/io/spokestack/spokestack/SpeechInput.java +++ b/src/main/java/io/spokestack/spokestack/SpeechInput.java @@ -6,7 +6,7 @@ * speech input interface. * *

- * This is the audio input interface to the SpokeStack framework. Implementors + * This is the audio input interface to the Spokestack framework. Implementors * must fill the specified audio frame buffer to capacity, based on the * configured sample size and frame size. *

diff --git a/src/main/java/io/spokestack/spokestack/SpeechPipeline.java b/src/main/java/io/spokestack/spokestack/SpeechPipeline.java index f7cfd1e..923f1f5 100644 --- a/src/main/java/io/spokestack/spokestack/SpeechPipeline.java +++ b/src/main/java/io/spokestack/spokestack/SpeechPipeline.java @@ -7,10 +7,10 @@ import java.nio.ByteOrder; /** - * SpokeStack speech pipeline. + * Spokestack speech pipeline. * *

- * This is the primary client entry point to the SpokeStack framework. It + * This is the primary client entry point to the Spokestack framework. It * dynamically binds to configured components that implement the pipeline * interfaces for reading audio frames and performing speech recognition tasks. *

diff --git a/src/main/java/io/spokestack/spokestack/microsoft/BingSpeechRecognizer.java b/src/main/java/io/spokestack/spokestack/microsoft/BingSpeechRecognizer.java index 9c2b01c..073823c 100644 --- a/src/main/java/io/spokestack/spokestack/microsoft/BingSpeechRecognizer.java +++ b/src/main/java/io/spokestack/spokestack/microsoft/BingSpeechRecognizer.java @@ -55,7 +55,7 @@ public final class BingSpeechRecognizer implements SpeechProcessor { /** * initializes a new recognizer instance. - * @param speechConfig SpokeStack speech configuration + * @param speechConfig Spokestack speech configuration * @throws Exception on error */ public BingSpeechRecognizer(SpeechConfig speechConfig) throws Exception { @@ -64,7 +64,7 @@ public BingSpeechRecognizer(SpeechConfig speechConfig) throws Exception { /** * initializes a new recognizer instance, useful for testing. - * @param speechConfig SpokeStack speech configuration + * @param speechConfig Spokestack speech configuration * @param builder speech client builder * @throws Exception on error */ diff --git a/src/main/java/io/spokestack/spokestack/package-info.java b/src/main/java/io/spokestack/spokestack/package-info.java index cda898f..b309959 100644 --- a/src/main/java/io/spokestack/spokestack/package-info.java +++ b/src/main/java/io/spokestack/spokestack/package-info.java @@ -1,5 +1,5 @@ /** - * The SpokeStack package contains the core classes that implement the speech + * The Spokestack package contains the core classes that implement the speech * recognition pipeline. */ package io.spokestack.spokestack; diff --git a/src/main/java/io/spokestack/spokestack/webrtc/AcousticNoiseSuppressor.java b/src/main/java/io/spokestack/spokestack/webrtc/AcousticNoiseSuppressor.java index eeacea7..63779fc 100644 --- a/src/main/java/io/spokestack/spokestack/webrtc/AcousticNoiseSuppressor.java +++ b/src/main/java/io/spokestack/spokestack/webrtc/AcousticNoiseSuppressor.java @@ -126,7 +126,7 @@ public void process(SpeechContext context, ByteBuffer frame) { // native interface //----------------------------------------------------------------------- static { - System.loadLibrary("spokestack"); + System.loadLibrary("spokestack-android"); } native long create(int rate, int policy); diff --git a/src/main/java/io/spokestack/spokestack/webrtc/AutomaticGainControl.java b/src/main/java/io/spokestack/spokestack/webrtc/AutomaticGainControl.java index 61cb76e..8271109 100644 --- a/src/main/java/io/spokestack/spokestack/webrtc/AutomaticGainControl.java +++ b/src/main/java/io/spokestack/spokestack/webrtc/AutomaticGainControl.java @@ -146,7 +146,7 @@ private double rms(ByteBuffer signal) { // native interface //----------------------------------------------------------------------- static { - System.loadLibrary("spokestack"); + System.loadLibrary("spokestack-android"); } native long create( diff --git a/src/main/java/io/spokestack/spokestack/webrtc/VoiceActivityDetector.java b/src/main/java/io/spokestack/spokestack/webrtc/VoiceActivityDetector.java index 98b00aa..fd412c3 100644 --- a/src/main/java/io/spokestack/spokestack/webrtc/VoiceActivityDetector.java +++ b/src/main/java/io/spokestack/spokestack/webrtc/VoiceActivityDetector.java @@ -167,7 +167,7 @@ public void process(SpeechContext context, ByteBuffer frame) { // native interface //----------------------------------------------------------------------- static { - System.loadLibrary("spokestack"); + System.loadLibrary("spokestack-android"); } native long create(int mode);