Upgrade Gradle.

Add 32 bits builds in CI

.github/workflows/release.yml

@@ -16,12 +16,32 @@ jobs:
           sudo apt-get update
           sudo apt-get install -y libspeechd-dev
           cargo build --release
-          mv target linux
+          mkdir linux
+          mv target/release/*.so linux
       - uses: actions/upload-artifact@v1
         with:
           name: linux
           path: linux
 
+  build_linux_32:
+    name: Build Linux (32 bits)
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: Swatinem/rust-cache@v1
+      - run: |
+          sudo dpkg --add-architecture i386
+          sudo apt-get update
+          sudo apt-get install -y libspeechd-dev:i386 gcc-multilib
+          rustup target add i686-unknown-linux-gnu
+          cargo build --release --target i686-unknown-linux-gnu
+          mkdir linux-32
+          mv target/i686-unknown-linux-gnu/release/*.so linux-32
+      - uses: actions/upload-artifact@v1
+        with:
+          name: linux-32
+          path: linux-32
+
   build_windows:
     name: Build Windows
     runs-on: windows-latest
@@ -32,13 +52,33 @@ jobs:
       - uses: Swatinem/rust-cache@v1
       - run: |
           choco install -qy llvm
-          cargo build --all-features --release
+          cargo build --release
-          move target windows
+          mkdir windows
+          move target\release\*.dll windows
       - uses: actions/upload-artifact@v1
         with:
           name: windows
           path: windows
 
+  build_windows_32:
+    name: Build Windows (32 bits)
+    runs-on: windows-latest
+    env:
+      LIBCLANG_PATH: c:\program files\llvm\bin
+    steps:
+      - uses: actions/checkout@v2
+      - uses: Swatinem/rust-cache@v1
+      - run: |
+          choco install -qy llvm
+          rustup target add i686-pc-windows-msvc
+          cargo build --release --target i686-pc-windows-msvc
+          mkdir windows-32
+          move target\i686-pc-windows-msvc\release\*.dll windows-32
+      - uses: actions/upload-artifact@v1
+        with:
+          name: windows-32
+          path: windows-32
+
   build_uwp:
     name: Build UWP
     runs-on: windows-latest
@@ -50,8 +90,8 @@ jobs:
       - run: |
           choco install -y llvm
           cargo build --release
-          move target uwp
+          mkdir uwp
-          move uwp\release\godot_tts.dll uwp\release\godot_tts.uwp.dll
+          move target\release\godot_tts.dll uwp\godot_tts.uwp.dll
       - uses: actions/upload-artifact@v1
         with:
           name: uwp
@@ -65,7 +105,8 @@ jobs:
       - uses: Swatinem/rust-cache@v1
       - run: |
           cargo build --release
-          mv target macos
+          mkdir macos
+          mv target/release/*.dylib macos
       - uses: actions/upload-artifact@v1
         with:
           name: macos
@@ -101,7 +142,8 @@ jobs:
           rustup target add aarch64-apple-ios x86_64-apple-ios
           cargo install cargo-lipo
           cargo lipo --release
-          mv target ios
+          mkdir ios
+          mv target/universal/release/*.a ios
       - uses: actions/upload-artifact@v1
         with:
           name: ios
@@ -113,7 +155,9 @@ jobs:
     needs:
       [
         build_linux,
+        build_linux_32,
         build_windows,
+        build_windows_32,
         build_uwp,
         build_macos,
         build_android,
@@ -124,9 +168,15 @@ jobs:
       - uses: actions/download-artifact@v1
         with:
           name: linux
+      - uses: actions/download-artifact@v1
+        with:
+          name: linux-32
       - uses: actions/download-artifact@v1
         with:
           name: windows
+      - uses: actions/download-artifact@v1
+        with:
+          name: windows-32
       - uses: actions/download-artifact@v1
         with:
           name: uwp
@@ -140,13 +190,15 @@ jobs:
         with:
           name: ios
       - run: |
-          mkdir -p godot-tts/target/release
+          mkdir -p godot-tts/target/release/32
-          cp linux/release/*.so godot-tts/target/release
+          cp linux/*.so godot-tts/target/release
-          cp windows/release/*.dll godot-tts/target/release
+          cp linux-32/*.so godot-tts/target/release/32
-          cp uwp/release/godot_tts.uwp.dll godot-tts/target/release
+          cp windows/*.dll godot-tts/target/release
-          cp macos/release/*.dylib godot-tts/target/release
+          cp windows-32/*.dll godot-tts/target/release/32
+          cp uwp/*.dll godot-tts/target/release
+          cp macos/*.dylib godot-tts/target/release
           cp android/outputs/aar/godot-tts.aar godot-tts/
-          cp ios/universal/release/*.a godot-tts/target/release
+          cp ios/*.a godot-tts/target/release
           cp LICENSE godot-tts
           cp README.md godot-tts
           cp TTS.gd godot-tts.g* godot-tts

Cargo.toml

@@ -7,14 +7,7 @@ edition = "2018"
 [lib]
 crate-type = ["staticlib", "cdylib"]
 
-[features]
-
-use_tolk = ["tolk", "tts/use_tolk"]
-
 [dependencies]
-env_logger = "0.8"
+env_logger = "0.10"
-gdnative = "0.9"
+gdnative = "0.11"
-tts = "0.13"
+tts = { version = "0.25", features = ["tolk"] }
-
-[target.'cfg(windows)'.dependencies]
-tolk = { version = "0.3", optional = true }

TTS.gd

@@ -36,6 +36,71 @@ func _ready():
 	pause_mode = Node.PAUSE_MODE_PROCESS
 
 
+func _get_min_volume():
+	if OS.has_feature('JavaScript'):
+		return 0
+	else:
+		return 0
+
+var min_volume setget , _get_min_volume
+
+
+func _get_max_volume():
+	if OS.has_feature('JavaScript'):
+		return 1.0
+	else:
+		return 0
+
+var max_volume setget , _get_max_volume
+
+
+func _get_normal_volume():
+	if OS.has_feature('JavaScript'):
+		return 1.0
+	else:
+		return 0
+
+var normal_volume setget , _get_normal_volume
+
+var javascript_volume = self.normal_volume
+
+
+func _set_volume(volume):
+	if volume < self.min_volume:
+		volume = self.min_volume
+	elif volume > self.max_volume:
+		volume = self.max_volume
+	if OS.has_feature('JavaScript'):
+		javascript_volume = volume
+
+
+func _get_volume():
+	if OS.has_feature('JavaScript'):
+		return javascript_volume
+	else:
+		return 0
+
+
+var volume setget _set_volume, _get_volume
+
+
+func _get_volume_percentage():
+	return range_lerp(self.volume, self.min_volume, self.max_volume, 0, 100)
+
+
+func _set_volume_percentage(v):
+	self.rate = range_lerp(v, 0, 100, self.min_volume, self.max_volume)
+
+
+var volume_percentage setget _set_volume_percentage, _get_volume_percentage
+
+
+func _get_normal_volume_percentage():
+	return range_lerp(self.normal_volume, self.min_volume, self.max_volume, 0, 100)
+
+var normal_volume_percentage setget , _get_normal_volume_percentage
+
+
 func _get_min_rate():
 	if OS.has_feature('JavaScript'):
 		return 0.1
@@ -134,8 +199,9 @@ func speak(text, interrupt := true):
 			"""
 			let utterance = new SpeechSynthesisUtterance("%s")
 			utterance.rate = %s
+			utterance.volume = %s
 		"""
-			% [text.replace("\n", " "), javascript_rate]
+			% [text.replace("\n", " "), javascript_rate, javascript_volume]
 		)
 		if interrupt:
 			code += """

godot-tts.gdnlib

@@ -2,14 +2,17 @@
 
 Server.64="res://addons/godot-tts/target/debug/libgodot_tts.so"
 Windows.64="res://addons/godot-tts/target/debug/godot_tts.dll"
+Windows.32="res://addons/godot-tts/target/debug/32/godot_tts.dll"
 UWP.64="res://addons/godot-tts/target/debug/godot_tts.dll"
 X11.64="res://addons/godot-tts/target/debug/libgodot_tts.so"
+X11.32="res://addons/godot-tts/target/debug/32/libgodot_tts.so"
 OSX.64="res://addons/godot-tts/target/debug/libgodot_tts.dylib"
-IOS="res://addons/godot-tts/target/universal/debug/libgodot_tts.a"
+IOS="res://addons/godot-tts/target/debug/libgodot_tts.a"
 
 [dependencies]
 
 Windows.64=[ "res://addons/godot-tts/target/debug/nvdaControllerClient64.dll", "res://addons/godot-tts/target/debug/SAAPI64.dll" ]
+Windows.32=[ "res://addons/godot-tts/target/debug/32/dolapi32.dll", "res://addons/godot-tts/target/debug/32/nvdaControllerClient32.dll", "res://addons/godot-tts/target/debug/32/SAAPI32.dll" ]
 
 [general]
 

godot-tts.gdnlib.release

@@ -2,15 +2,17 @@
 
 Server.64="res://addons/godot-tts/target/release/libgodot_tts.so"
 Windows.64="res://addons/godot-tts/target/release/godot_tts.dll"
+Windows.32="res://addons/godot-tts/target/release/32/godot_tts.dll"
 UWP.64="res://addons/godot-tts/target/release/godot_tts.uwp.dll"
 X11.64="res://addons/godot-tts/target/release/libgodot_tts.so"
+X11.32="res://addons/godot-tts/target/release/32/libgodot_tts.so"
 OSX.64="res://addons/godot-tts/target/release/libgodot_tts.dylib"
 IOS="res://addons/godot-tts/target/release/libgodot_tts.a"
 
 [dependencies]
 
 Windows.64=[ "res://addons/godot-tts/target/release/nvdaControllerClient64.dll", "res://addons/godot-tts/target/release/SAAPI64.dll" ]
-X11.64=[  ]
+Windows.32=[ "res://addons/godot-tts/target/release/32/dolapi32.dll", "res://addons/godot-tts/target/release/32/nvdaControllerClient32.dll", "res://addons/godot-tts/target/release/32/SAAPI32.dll" ]
 
 [general]
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -1,78 +1,129 @@
-#!/usr/bin/env sh
+#!/bin/sh
+
+#
+# Copyright © 2015-2021 the original authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
 
 ##############################################################################
-##
+#
-##  Gradle start up script for UN*X
+#   Gradle start up script for POSIX generated by Gradle.
-##
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################
 
 # Attempt to set APP_HOME
+
 # Resolve links: $0 may be a link
-PRG="$0"
+app_path=$0
-# Need this for relative symlinks.
+
-while [ -h "$PRG" ] ; do
+# Need this for daisy-chained symlinks.
-    ls=`ls -ld "$PRG"`
+while
-    link=`expr "$ls" : '.*-> \(.*\)$'`
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
-    if expr "$link" : '/.*' > /dev/null; then
+    [ -h "$app_path" ]
-        PRG="$link"
+do
-    else
+    ls=$( ls -ld "$app_path" )
-        PRG=`dirname "$PRG"`"/$link"
+    link=${ls#*' -> '}
-    fi
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
 done
-SAVED="`pwd`"
+
-cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
 
 APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
+APP_BASE_NAME=${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='"-Xmx64m"'
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
 
 warn () {
     echo "$*"
-}
+} >&2
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-}
+} >&2
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "`uname`" in
+case "$( uname )" in                #(
-  CYGWIN* )
+  CYGWIN* )         cygwin=true  ;; #(
-    cygwin=true
+  Darwin* )         darwin=true  ;; #(
-    ;;
+  MSYS* | MINGW* )  msys=true    ;; #(
-  Darwin* )
+  NONSTOP* )        nonstop=true ;;
-    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"
+        JAVACMD=$JAVA_HOME/jre/sh/java
     else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -81,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD="java"
+    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
@@ -89,84 +140,95 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
+    case $MAX_FD in #(
-    if [ $? -eq 0 ] ; then
+      max*)
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+        MAX_FD=$( ulimit -H -n ) ||
-            MAX_FD="$MAX_FD_LIMIT"
+            warn "Could not query maximum file descriptor limit"
-        fi
+    esac
-        ulimit -n $MAX_FD
+    case $MAX_FD in  #(
-        if [ $? -ne 0 ] ; then
+      '' | soft) :;; #(
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
+      *)
-        fi
+        ulimit -n "$MAX_FD" ||
-    else
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
-        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
+# Collect all arguments for the java command, stacking in reverse order:
-save () {
+#   * args from the command line
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+#   * the main class name
-    echo " "
+#   * -classpath
-}
+#   * -D...appname settings
-APP_ARGS=$(save "$@")
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
 
-# Collect all arguments for the java command, following the shell quoting and substitution rules
+# For Cygwin or MSYS, switch paths to Windows format before running java
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
 
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+
-  cd "$(dirname "$0")"
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
 fi
 
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
+
 exec "$JAVACMD" "$@"

gradlew.bat

@@ -1,3 +1,19 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
 @if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
@@ -13,15 +29,18 @@ if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
 @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="-Xmx64m"
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
 @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
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -35,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -45,28 +64,14 @@ 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%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell

src/lib.rs

@@ -1,10 +1,9 @@
 use std::sync::mpsc::{channel, Receiver};
 
 use gdnative::prelude::*;
-use tts::{Features, UtteranceId, TTS as Tts};
+use tts::{Features, Tts, UtteranceId};
 
 #[derive(NativeClass)]
-#[inherit(Reference)]
 struct Utterance(pub(crate) Option<UtteranceId>);
 
 #[methods]
@@ -21,6 +20,7 @@ enum Msg {
     UtteranceStop(UtteranceId),
 }
 
+#[allow(clippy::upper_case_acronyms)]
 #[derive(NativeClass)]
 #[inherit(Node)]
 #[register_with(Self::register)]
@@ -62,7 +62,71 @@ impl TTS {
 
     fn register(builder: &ClassBuilder<Self>) {
         builder
-            .add_property("rate")
+            .property("volume")
+            .with_getter(|this: &TTS, _| match this.0.get_volume() {
+                Ok(volume) => volume,
+                _ => 0.,
+            })
+            .with_setter(|this: &mut TTS, _, v: f32| {
+                let Features {
+                    volume: volume_supported,
+                    ..
+                } = this.0.supported_features();
+                if volume_supported {
+                    let mut v = v;
+                    if v < this.0.min_volume() {
+                        v = this.0.min_volume();
+                    } else if v > this.0.max_volume() {
+                        v = this.0.max_volume();
+                    }
+                    this.0.set_volume(v).expect("Failed to set volume");
+                }
+            })
+            .done();
+        builder
+            .property("min_volume")
+            .with_getter(|this: &TTS, _| {
+                let Features {
+                    volume: volume_supported,
+                    ..
+                } = this.0.supported_features();
+                if volume_supported {
+                    this.0.min_volume()
+                } else {
+                    0.
+                }
+            })
+            .done();
+        builder
+            .property("max_volume")
+            .with_getter(|this: &TTS, _| {
+                let Features {
+                    volume: volume_supported,
+                    ..
+                } = this.0.supported_features();
+                if volume_supported {
+                    this.0.max_volume()
+                } else {
+                    0.
+                }
+            })
+            .done();
+        builder
+            .property("normal_volume")
+            .with_getter(|this: &TTS, _| {
+                let Features {
+                    volume: volume_supported,
+                    ..
+                } = this.0.supported_features();
+                if volume_supported {
+                    this.0.normal_volume()
+                } else {
+                    0.
+                }
+            })
+            .done();
+        builder
+            .property("rate")
             .with_getter(|this: &TTS, _| match this.0.get_rate() {
                 Ok(rate) => rate,
                 _ => 0.,
@@ -84,7 +148,7 @@ impl TTS {
             })
             .done();
         builder
-            .add_property("min_rate")
+            .property("min_rate")
             .with_getter(|this: &TTS, _| {
                 let Features {
                     rate: rate_supported,
@@ -98,7 +162,7 @@ impl TTS {
             })
             .done();
         builder
-            .add_property("max_rate")
+            .property("max_rate")
             .with_getter(|this: &TTS, _| {
                 let Features {
                     rate: rate_supported,
@@ -112,7 +176,7 @@ impl TTS {
             })
             .done();
         builder
-            .add_property("normal_rate")
+            .property("normal_rate")
             .with_getter(|this: &TTS, _| {
                 let Features {
                     rate: rate_supported,
@@ -126,23 +190,15 @@ impl TTS {
             })
             .done();
         builder
-            .add_property("can_detect_screen_reader")
+            .property("can_detect_screen_reader")
-            .with_getter(|_: &TTS, _| cfg!(all(windows, features = "use_tolk")))
+            .with_getter(|_: &TTS, _| cfg!(windows))
-            .done();
-        #[allow(unreachable_code)]
-        builder
-            .add_property("has_screen_reader")
-            .with_getter(|_: &TTS, _| {
-                #[cfg(all(windows, features = "use_tolk"))]
-                {
-                    let tolk = tolk::Tolk::new();
-                    return tolk.detect_screen_reader().is_some();
-                }
-                false
-            })
             .done();
         builder
-            .add_property("can_detect_is_speaking")
+            .property("has_screen_reader")
+            .with_getter(|_, _| Tts::screen_reader_available())
+            .done();
+        builder
+            .property("can_detect_is_speaking")
             .with_getter(|this: &TTS, _| {
                 let Features {
                     is_speaking: is_speaking_supported,
@@ -152,7 +208,7 @@ impl TTS {
             })
             .done();
         builder
-            .add_property("is_speaking")
+            .property("is_speaking")
             .with_getter(|this: &TTS, _| {
                 let Features {
                     is_speaking: is_speaking_supported,
@@ -167,38 +223,37 @@ impl TTS {
                 }
             })
             .done();
-        builder.add_signal(Signal {
+        builder
-            name: "utterance_begin",
+            .signal("utterance_begin")
-            args: &[SignalArgument {
+            .with_param_custom(SignalParam {
-                name: "utterance",
+                name: "utterance".into(),
                 default: Variant::default(),
                 export_info: ExportInfo::new(VariantType::Object),
                 usage: PropertyUsage::DEFAULT,
-            }],
+            })
-        });
+            .done();
-        builder.add_signal(Signal {
+        builder
-            name: "utterance_end",
+            .signal("utterance_end")
-            args: &[SignalArgument {
+            .with_param_custom(SignalParam {
-                name: "utterance",
+                name: "utterance".into(),
                 default: Variant::default(),
                 export_info: ExportInfo::new(VariantType::Object),
                 usage: PropertyUsage::DEFAULT,
-            }],
+            })
-        });
+            .done();
-        builder.add_signal(Signal {
+        builder
-            name: "utterance_stop",
+            .signal("utterance_stop")
-            args: &[SignalArgument {
+            .with_param_custom(SignalParam {
-                name: "utterance",
+                name: "utterance".into(),
                 default: Variant::default(),
                 export_info: ExportInfo::new(VariantType::Object),
                 usage: PropertyUsage::DEFAULT,
-            }],
+            })
-        });
+            .done();
     }
 
-    #[export]
+    #[method]
-    fn speak(&mut self, _owner: &Node, message: GodotString, interrupt: bool) -> Variant {
+    fn speak(&mut self, message: String, interrupt: bool) -> Variant {
-        let message = message.to_string();
         if let Ok(id) = self.0.speak(message, interrupt) {
             let utterance: Instance<Utterance, Unique> = Instance::new();
             if id.is_some() {
@@ -212,13 +267,13 @@ impl TTS {
         }
     }
 
-    #[export]
+    #[method]
-    fn stop(&mut self, _owner: &Node) {
+    fn stop(&mut self) {
         self.0.stop().expect("Failed to stop");
     }
 
-    #[export]
+    #[method]
-    fn is_rate_supported(&mut self, _owner: &Node) -> bool {
+    fn is_rate_supported(&mut self) -> bool {
         let Features {
             rate: rate_supported,
             ..
@@ -226,8 +281,8 @@ impl TTS {
         rate_supported
     }
 
-    #[export]
+    #[method]
-    fn are_utterance_callbacks_supported(&mut self, _owner: &Node) -> bool {
+    fn are_utterance_callbacks_supported(&mut self) -> bool {
         let Features {
             utterance_callbacks: supported,
             ..
@@ -235,8 +290,8 @@ impl TTS {
         supported
     }
 
-    #[export]
+    #[method]
-    fn _process(&mut self, owner: &Node, _delta: f32) {
+    fn _process(&mut self, #[base] base: &Node, _delta: f32) {
         if let Ok(msg) = self.1.try_recv() {
             match msg {
                 Msg::UtteranceBegin(utterance_id) => {
@@ -244,21 +299,21 @@ impl TTS {
                     utterance
                         .map_mut(|u, _| u.0 = Some(utterance_id))
                         .expect("Failed to set utterance ID");
-                    owner.emit_signal("utterance_begin", &[utterance.owned_to_variant()]);
+                    base.emit_signal("utterance_begin", &[utterance.owned_to_variant()]);
                 }
                 Msg::UtteranceEnd(utterance_id) => {
                     let utterance: Instance<Utterance, Unique> = Instance::new();
                     utterance
                         .map_mut(|u, _| u.0 = Some(utterance_id))
                         .expect("Failed to set utterance ID");
-                    owner.emit_signal("utterance_end", &[utterance.owned_to_variant()]);
+                    base.emit_signal("utterance_end", &[utterance.owned_to_variant()]);
                 }
                 Msg::UtteranceStop(utterance_id) => {
                     let utterance: Instance<Utterance, Unique> = Instance::new();
                     utterance
                         .map_mut(|u, _| u.0 = Some(utterance_id))
                         .expect("Failed to set utterance ID");
-                    owner.emit_signal("utterance_stop", &[utterance.owned_to_variant()]);
+                    base.emit_signal("utterance_stop", &[utterance.owned_to_variant()]);
                 }
             }
         }
@@ -271,6 +326,4 @@ fn init(handle: InitHandle) {
     handle.add_class::<TTS>();
 }
 
-godot_gdnative_init!();
+godot_init!(init);
-godot_nativescript_init!(init);
-godot_gdnative_terminate!();

src/main/java/games/lightsout/godot/tts/TTS.java

@@ -18,6 +18,7 @@ import android.view.accessibility.AccessibilityManager;
 public class TTS extends GodotPlugin implements TextToSpeech.OnInitListener {
     private TextToSpeech tts = null;
 
+    private float volume = 1f;
     private float rate = 1f;
 
     private Integer utteranceId = 0;
@@ -36,6 +37,15 @@ public class TTS extends GodotPlugin implements TextToSpeech.OnInitListener {
         tts.stop();
     }
 
+    public float get_volume() {
+        return this.volume;
+    }
+
+    public void set_volume(float volume) {
+        this.volume = volume;
+        tts.Engine.KEY_PARAM_VOLUME = volume;
+    }
+
     public float get_rate() {
         return this.rate;
     }