diff --git a/.github/workflows/aarch64-linux-gnu-shared.yaml b/.github/workflows/aarch64-linux-gnu-shared.yaml index 50ba2c23..5e82d9b3 100644 --- a/.github/workflows/aarch64-linux-gnu-shared.yaml +++ b/.github/workflows/aarch64-linux-gnu-shared.yaml @@ -6,7 +6,7 @@ on: branches: - master tags: - - '*' + - 'v[0-9]+.[0-9]+.[0-9]+*' paths: - '.github/workflows/aarch64-linux-gnu-shared.yaml' - 'CMakeLists.txt' diff --git a/.github/workflows/aarch64-linux-gnu-static.yaml b/.github/workflows/aarch64-linux-gnu-static.yaml index 13edc9c1..765e2422 100644 --- a/.github/workflows/aarch64-linux-gnu-static.yaml +++ b/.github/workflows/aarch64-linux-gnu-static.yaml @@ -6,7 +6,7 @@ on: branches: - master tags: - - '*' + - 'v[0-9]+.[0-9]+.[0-9]+*' paths: - '.github/workflows/aarch64-linux-gnu-static.yaml' - 'CMakeLists.txt' diff --git a/.github/workflows/android.yaml b/.github/workflows/android.yaml index 69bfe2e3..35dfd6b2 100644 --- a/.github/workflows/android.yaml +++ b/.github/workflows/android.yaml @@ -12,7 +12,7 @@ on: - 'sherpa-onnx/jni/*' - 'build-android*.sh' tags: - - '*' + - 'v[0-9]+.[0-9]+.[0-9]+*' pull_request: branches: - master diff --git a/.github/workflows/apk-asr-2pass.yaml b/.github/workflows/apk-asr-2pass.yaml index a79a28af..1e781694 100644 --- a/.github/workflows/apk-asr-2pass.yaml +++ b/.github/workflows/apk-asr-2pass.yaml @@ -3,7 +3,7 @@ name: apk-asr-2pass on: push: tags: - - '*' + - 'v[0-9]+.[0-9]+.[0-9]+*' workflow_dispatch: diff --git a/.github/workflows/apk-asr.yaml b/.github/workflows/apk-asr.yaml index d381cb1a..69490cc8 100644 --- a/.github/workflows/apk-asr.yaml +++ b/.github/workflows/apk-asr.yaml @@ -3,7 +3,7 @@ name: apk-asr on: push: tags: - - '*' + - 'v[0-9]+.[0-9]+.[0-9]+*' workflow_dispatch: diff --git a/.github/workflows/apk-audio-tagging-wearos.yaml b/.github/workflows/apk-audio-tagging-wearos.yaml index b2d2d959..577b79ac 100644 --- a/.github/workflows/apk-audio-tagging-wearos.yaml +++ b/.github/workflows/apk-audio-tagging-wearos.yaml @@ -3,7 +3,7 @@ name: apk-audio-tagging-wearos on: push: tags: - - '*' + - 'v[0-9]+.[0-9]+.[0-9]+*' workflow_dispatch: diff --git a/.github/workflows/apk-audio-tagging.yaml b/.github/workflows/apk-audio-tagging.yaml index db739021..efd71037 100644 --- a/.github/workflows/apk-audio-tagging.yaml +++ b/.github/workflows/apk-audio-tagging.yaml @@ -3,7 +3,7 @@ name: apk-audio-tagging on: push: tags: - - '*' + - 'v[0-9]+.[0-9]+.[0-9]+*' workflow_dispatch: diff --git a/.github/workflows/apk-kws.yaml b/.github/workflows/apk-kws.yaml index 8c348e5a..5629c5d0 100644 --- a/.github/workflows/apk-kws.yaml +++ b/.github/workflows/apk-kws.yaml @@ -3,7 +3,7 @@ name: apk-kws on: push: tags: - - '*' + - 'v[0-9]+.[0-9]+.[0-9]+*' workflow_dispatch: diff --git a/.github/workflows/apk-speaker-identification.yaml b/.github/workflows/apk-speaker-identification.yaml index 2d674c78..ecaf0697 100644 --- a/.github/workflows/apk-speaker-identification.yaml +++ b/.github/workflows/apk-speaker-identification.yaml @@ -3,7 +3,7 @@ name: apk-speaker-identification on: push: tags: - - '*' + - 'v[0-9]+.[0-9]+.[0-9]+*' workflow_dispatch: diff --git a/.github/workflows/apk-spoken-language-identification.yaml b/.github/workflows/apk-spoken-language-identification.yaml index dd432215..ad63dde6 100644 --- a/.github/workflows/apk-spoken-language-identification.yaml +++ b/.github/workflows/apk-spoken-language-identification.yaml @@ -3,7 +3,7 @@ name: apk-slid on: push: tags: - - '*' + - 'v[0-9]+.[0-9]+.[0-9]+*' workflow_dispatch: diff --git a/.github/workflows/apk-tts-engine.yaml b/.github/workflows/apk-tts-engine.yaml index 89013a59..d225df02 100644 --- a/.github/workflows/apk-tts-engine.yaml +++ b/.github/workflows/apk-tts-engine.yaml @@ -3,7 +3,7 @@ name: apk-tts-engine on: push: tags: - - '*' + - 'v[0-9]+.[0-9]+.[0-9]+*' workflow_dispatch: diff --git a/.github/workflows/apk-tts.yaml b/.github/workflows/apk-tts.yaml index 1b51368e..60ae9c72 100644 --- a/.github/workflows/apk-tts.yaml +++ b/.github/workflows/apk-tts.yaml @@ -3,7 +3,7 @@ name: apk-tts on: push: tags: - - '*' + - 'v[0-9]+.[0-9]+.[0-9]+*' workflow_dispatch: diff --git a/.github/workflows/apk-vad-asr.yaml b/.github/workflows/apk-vad-asr.yaml index aea8028d..574b4bf1 100644 --- a/.github/workflows/apk-vad-asr.yaml +++ b/.github/workflows/apk-vad-asr.yaml @@ -3,7 +3,7 @@ name: apk-vad-asr on: push: tags: - - '*' + - 'v[0-9]+.[0-9]+.[0-9]+*' workflow_dispatch: diff --git a/.github/workflows/apk-vad.yaml b/.github/workflows/apk-vad.yaml index ddd8c6af..6d5259a7 100644 --- a/.github/workflows/apk-vad.yaml +++ b/.github/workflows/apk-vad.yaml @@ -3,7 +3,7 @@ name: apk-vad on: push: tags: - - '*' + - 'v[0-9]+.[0-9]+.[0-9]+*' workflow_dispatch: diff --git a/.github/workflows/arm-linux-gnueabihf.yaml b/.github/workflows/arm-linux-gnueabihf.yaml index 26945681..c260c5a0 100644 --- a/.github/workflows/arm-linux-gnueabihf.yaml +++ b/.github/workflows/arm-linux-gnueabihf.yaml @@ -13,7 +13,7 @@ on: - 'sherpa-onnx/c-api/*' - 'toolchains/arm-linux-gnueabihf.toolchain.cmake' tags: - - '*' + - 'v[0-9]+.[0-9]+.[0-9]+*' pull_request: branches: - master diff --git a/.github/workflows/build-wheels-aarch64.yaml b/.github/workflows/build-wheels-aarch64.yaml index 971324e9..4bc5b79c 100644 --- a/.github/workflows/build-wheels-aarch64.yaml +++ b/.github/workflows/build-wheels-aarch64.yaml @@ -3,7 +3,7 @@ name: build-wheels-aarch64 on: push: tags: - - '*' + - 'v[0-9]+.[0-9]+.[0-9]+*' workflow_dispatch: env: diff --git a/.github/workflows/build-wheels-armv7l.yaml b/.github/workflows/build-wheels-armv7l.yaml index a720a39f..6b7d7446 100644 --- a/.github/workflows/build-wheels-armv7l.yaml +++ b/.github/workflows/build-wheels-armv7l.yaml @@ -3,7 +3,7 @@ name: build-wheels-armv7l on: push: tags: - - '*' + - 'v[0-9]+.[0-9]+.[0-9]+*' workflow_dispatch: env: diff --git a/.github/workflows/build-wheels-linux.yaml b/.github/workflows/build-wheels-linux.yaml index 7a4f5901..42654562 100644 --- a/.github/workflows/build-wheels-linux.yaml +++ b/.github/workflows/build-wheels-linux.yaml @@ -3,7 +3,7 @@ name: build-wheels-linux on: push: tags: - - '*' + - 'v[0-9]+.[0-9]+.[0-9]+*' workflow_dispatch: env: diff --git a/.github/workflows/build-wheels-macos-arm64.yaml b/.github/workflows/build-wheels-macos-arm64.yaml index c31d92bf..bc02ce38 100644 --- a/.github/workflows/build-wheels-macos-arm64.yaml +++ b/.github/workflows/build-wheels-macos-arm64.yaml @@ -3,7 +3,7 @@ name: build-wheels-macos-arm64 on: push: tags: - - '*' + - 'v[0-9]+.[0-9]+.[0-9]+*' workflow_dispatch: env: diff --git a/.github/workflows/build-wheels-macos-universal2.yaml b/.github/workflows/build-wheels-macos-universal2.yaml index d08a9307..2ffaf93c 100644 --- a/.github/workflows/build-wheels-macos-universal2.yaml +++ b/.github/workflows/build-wheels-macos-universal2.yaml @@ -5,7 +5,7 @@ on: branches: - wheel tags: - - '*' + - 'v[0-9]+.[0-9]+.[0-9]+*' workflow_dispatch: env: diff --git a/.github/workflows/build-wheels-macos-x64.yaml b/.github/workflows/build-wheels-macos-x64.yaml index 250ef76c..8ad21d0e 100644 --- a/.github/workflows/build-wheels-macos-x64.yaml +++ b/.github/workflows/build-wheels-macos-x64.yaml @@ -5,7 +5,7 @@ on: branches: - wheel tags: - - '*' + - 'v[0-9]+.[0-9]+.[0-9]+*' workflow_dispatch: env: diff --git a/.github/workflows/build-wheels-win32.yaml b/.github/workflows/build-wheels-win32.yaml index 752fbef3..ab3d32b1 100644 --- a/.github/workflows/build-wheels-win32.yaml +++ b/.github/workflows/build-wheels-win32.yaml @@ -3,7 +3,7 @@ name: build-wheels-win32 on: push: tags: - - '*' + - 'v[0-9]+.[0-9]+.[0-9]+*' workflow_dispatch: env: diff --git a/.github/workflows/build-wheels-win64.yaml b/.github/workflows/build-wheels-win64.yaml index ee9f020a..7e7d810d 100644 --- a/.github/workflows/build-wheels-win64.yaml +++ b/.github/workflows/build-wheels-win64.yaml @@ -5,7 +5,7 @@ on: branches: - wheel tags: - - '*' + - 'v[0-9]+.[0-9]+.[0-9]+*' workflow_dispatch: env: diff --git a/.github/workflows/build-xcframework.yaml b/.github/workflows/build-xcframework.yaml index f6d0dce7..2afd95ca 100644 --- a/.github/workflows/build-xcframework.yaml +++ b/.github/workflows/build-xcframework.yaml @@ -12,7 +12,7 @@ on: - 'sherpa-onnx/csrc/*' - 'sherpa-onnx/c-api/*' tags: - - '*' + - 'v[0-9]+.[0-9]+.[0-9]+*' pull_request: branches: - master diff --git a/.github/workflows/flutter-linux.yaml b/.github/workflows/flutter-linux.yaml index a74f4500..ca665fd8 100644 --- a/.github/workflows/flutter-linux.yaml +++ b/.github/workflows/flutter-linux.yaml @@ -5,7 +5,7 @@ on: branches: - flutter tags: - - '*' + - 'v[0-9]+.[0-9]+.[0-9]+*' paths: - '.github/workflows/flutter-linux.yaml' - 'CMakeLists.txt' diff --git a/.github/workflows/flutter-macos.yaml b/.github/workflows/flutter-macos.yaml index 25a53d89..d92d3087 100644 --- a/.github/workflows/flutter-macos.yaml +++ b/.github/workflows/flutter-macos.yaml @@ -5,7 +5,7 @@ on: branches: - flutter tags: - - '*' + - 'v[0-9]+.[0-9]+.[0-9]+*' paths: - '.github/workflows/flutter-macos.yaml' - 'CMakeLists.txt' diff --git a/.github/workflows/flutter-windows-x64.yaml b/.github/workflows/flutter-windows-x64.yaml index cfe54b05..ce4e7456 100644 --- a/.github/workflows/flutter-windows-x64.yaml +++ b/.github/workflows/flutter-windows-x64.yaml @@ -5,7 +5,7 @@ on: branches: - flutter tags: - - '*' + - 'v[0-9]+.[0-9]+.[0-9]+*' paths: - '.github/workflows/flutter-windows-x64.yaml' - 'CMakeLists.txt' diff --git a/.github/workflows/linux-gpu.yaml b/.github/workflows/linux-gpu.yaml index bccde739..3f6052e6 100644 --- a/.github/workflows/linux-gpu.yaml +++ b/.github/workflows/linux-gpu.yaml @@ -5,7 +5,7 @@ on: branches: - master tags: - - '*' + - 'v[0-9]+.[0-9]+.[0-9]+*' paths: - '.github/workflows/linux-gpu.yaml' - '.github/scripts/test-online-transducer.sh' diff --git a/.github/workflows/linux.yaml b/.github/workflows/linux.yaml index 861a2df0..3d95d3c5 100644 --- a/.github/workflows/linux.yaml +++ b/.github/workflows/linux.yaml @@ -5,7 +5,7 @@ on: branches: - master tags: - - '*' + - 'v[0-9]+.[0-9]+.[0-9]+*' paths: - '.github/workflows/linux.yaml' - '.github/scripts/test-kws.sh' diff --git a/.github/workflows/macos.yaml b/.github/workflows/macos.yaml index 1c7fe2ee..cb88c853 100644 --- a/.github/workflows/macos.yaml +++ b/.github/workflows/macos.yaml @@ -5,7 +5,7 @@ on: branches: - master tags: - - '*' + - 'v[0-9]+.[0-9]+.[0-9]+*' paths: - '.github/workflows/macos.yaml' - '.github/scripts/test-kws.sh' diff --git a/.github/workflows/mfc.yaml b/.github/workflows/mfc.yaml index 197386bb..e501478a 100644 --- a/.github/workflows/mfc.yaml +++ b/.github/workflows/mfc.yaml @@ -5,7 +5,7 @@ on: branches: - master tags: - - '*' + - 'v[0-9]+.[0-9]+.[0-9]+*' paths: - '.github/workflows/mfc.yaml' - 'CMakeLists.txt' diff --git a/.github/workflows/pkg-config.yaml b/.github/workflows/pkg-config.yaml index b1b24218..57ed8a21 100644 --- a/.github/workflows/pkg-config.yaml +++ b/.github/workflows/pkg-config.yaml @@ -6,7 +6,7 @@ on: - master - pkg-config tags: - - '*' + - 'v[0-9]+.[0-9]+.[0-9]+*' paths: - '.github/workflows/pkg-config.yaml' - '.github/scripts/test-offline-tts.sh' diff --git a/.github/workflows/release-dart-package.yaml b/.github/workflows/release-dart-package.yaml index 9ed4d015..9f577ed2 100644 --- a/.github/workflows/release-dart-package.yaml +++ b/.github/workflows/release-dart-package.yaml @@ -5,7 +5,7 @@ on: branches: - ci-pub-dart tags: - - 'v[0-9]+.[0-9]+.[0-9]+*' # tag-pattern on pub.dev: 'v{{version}}' + - 'dart-v[0-9]+.[0-9]+.[0-9]+*' # tag-pattern on pub.dev: 'v{{version}}' workflow_dispatch: diff --git a/.github/workflows/riscv64-linux.yaml b/.github/workflows/riscv64-linux.yaml index 5393e973..acae80e4 100644 --- a/.github/workflows/riscv64-linux.yaml +++ b/.github/workflows/riscv64-linux.yaml @@ -13,7 +13,7 @@ on: - 'toolchains/riscv64-linux-gnu.toolchain.cmake' - 'build-riscv64-linux-gnu.sh' tags: - - '*' + - 'v[0-9]+.[0-9]+.[0-9]+*' pull_request: branches: - master diff --git a/.github/workflows/windows-arm64.yaml b/.github/workflows/windows-arm64.yaml index 4fb85a9e..9b56c7b2 100644 --- a/.github/workflows/windows-arm64.yaml +++ b/.github/workflows/windows-arm64.yaml @@ -5,7 +5,7 @@ on: branches: - master tags: - - '*' + - 'v[0-9]+.[0-9]+.[0-9]+*' paths: - '.github/workflows/windows-arm64.yaml' - 'CMakeLists.txt' diff --git a/.github/workflows/windows-x64-cuda.yaml b/.github/workflows/windows-x64-cuda.yaml index 0672065c..557d1d34 100644 --- a/.github/workflows/windows-x64-cuda.yaml +++ b/.github/workflows/windows-x64-cuda.yaml @@ -5,7 +5,7 @@ on: branches: - master tags: - - '*' + - 'v[0-9]+.[0-9]+.[0-9]+*' paths: - '.github/workflows/windows-x64-cuda.yaml' - '.github/scripts/test-online-transducer.sh' diff --git a/.github/workflows/windows-x64-debug.yaml b/.github/workflows/windows-x64-debug.yaml index fd4e1dd1..50176324 100644 --- a/.github/workflows/windows-x64-debug.yaml +++ b/.github/workflows/windows-x64-debug.yaml @@ -5,7 +5,7 @@ on: branches: - master tags: - - '*' + - 'v[0-9]+.[0-9]+.[0-9]+*' paths: - '.github/workflows/windows-x64-debug.yaml' - '.github/scripts/test-online-transducer.sh' diff --git a/.github/workflows/windows-x64.yaml b/.github/workflows/windows-x64.yaml index d1e0a2d4..ebd61866 100644 --- a/.github/workflows/windows-x64.yaml +++ b/.github/workflows/windows-x64.yaml @@ -5,7 +5,7 @@ on: branches: - master tags: - - '*' + - 'v[0-9]+.[0-9]+.[0-9]+*' paths: - '.github/workflows/windows-x64.yaml' - '.github/scripts/test-online-transducer.sh' diff --git a/.github/workflows/windows-x86-debug.yaml b/.github/workflows/windows-x86-debug.yaml index 0b56e157..03dce165 100644 --- a/.github/workflows/windows-x86-debug.yaml +++ b/.github/workflows/windows-x86-debug.yaml @@ -5,7 +5,7 @@ on: branches: - master tags: - - '*' + - 'v[0-9]+.[0-9]+.[0-9]+*' paths: - '.github/workflows/windows-x86-debug.yaml' - '.github/scripts/test-online-transducer.sh' diff --git a/.github/workflows/windows-x86.yaml b/.github/workflows/windows-x86.yaml index 1230b20a..44321114 100644 --- a/.github/workflows/windows-x86.yaml +++ b/.github/workflows/windows-x86.yaml @@ -5,7 +5,7 @@ on: branches: - master tags: - - '*' + - 'v[0-9]+.[0-9]+.[0-9]+*' paths: - '.github/workflows/windows-x86.yaml' - '.github/scripts/test-online-transducer.sh' diff --git a/CMakeLists.txt b/CMakeLists.txt index 4c1f6641..974dd1c8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,7 +7,7 @@ project(sherpa-onnx) # Remember to update # ./nodejs-addon-examples # ./dart-api-examples/ -set(SHERPA_ONNX_VERSION "1.9.29") +set(SHERPA_ONNX_VERSION "1.9.30") # Disable warning about # diff --git a/dart-api-examples/non-streaming-asr/pubspec.yaml b/dart-api-examples/non-streaming-asr/pubspec.yaml index 61dbe71f..9253f105 100644 --- a/dart-api-examples/non-streaming-asr/pubspec.yaml +++ b/dart-api-examples/non-streaming-asr/pubspec.yaml @@ -10,7 +10,7 @@ environment: # Add regular dependencies here. dependencies: - sherpa_onnx: ^1.9.29 + sherpa_onnx: ^1.9.30 path: ^1.9.0 args: ^2.5.0 diff --git a/dart-api-examples/streaming-asr/pubspec.yaml b/dart-api-examples/streaming-asr/pubspec.yaml index 372fbf6e..a740b371 100644 --- a/dart-api-examples/streaming-asr/pubspec.yaml +++ b/dart-api-examples/streaming-asr/pubspec.yaml @@ -11,7 +11,7 @@ environment: # Add regular dependencies here. dependencies: - sherpa_onnx: ^1.9.29 + sherpa_onnx: ^1.9.30 path: ^1.9.0 args: ^2.5.0 diff --git a/dart-api-examples/tts/pubspec.yaml b/dart-api-examples/tts/pubspec.yaml index 205ef9b0..fed0bf4e 100644 --- a/dart-api-examples/tts/pubspec.yaml +++ b/dart-api-examples/tts/pubspec.yaml @@ -8,7 +8,7 @@ environment: # Add regular dependencies here. dependencies: - sherpa_onnx: ^1.9.29 + sherpa_onnx: ^1.9.30 path: ^1.9.0 args: ^2.5.0 diff --git a/dart-api-examples/vad/pubspec.yaml b/dart-api-examples/vad/pubspec.yaml index 54c13e0f..e0d6f6dc 100644 --- a/dart-api-examples/vad/pubspec.yaml +++ b/dart-api-examples/vad/pubspec.yaml @@ -9,7 +9,7 @@ environment: sdk: ^3.4.0 dependencies: - sherpa_onnx: ^1.9.29 + sherpa_onnx: ^1.9.30 path: ^1.9.0 args: ^2.5.0 diff --git a/nodejs-addon-examples/package.json b/nodejs-addon-examples/package.json index 55298ec9..28d846a1 100644 --- a/nodejs-addon-examples/package.json +++ b/nodejs-addon-examples/package.json @@ -1,5 +1,5 @@ { "dependencies": { - "sherpa-onnx-node": "^1.9.29" + "sherpa-onnx-node": "^1.9.30" } } diff --git a/scripts/dart/release.sh b/scripts/dart/release.sh index 78b80ae6..d1d72836 100755 --- a/scripts/dart/release.sh +++ b/scripts/dart/release.sh @@ -27,7 +27,7 @@ HF_MIRROR=hf.co linux_wheel_filename=sherpa_onnx-${SHERPA_ONNX_VERSION}-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl linux_wheel=$src_dir/$linux_wheel_filename -macos_wheel_filename=sherpa_onnx-${SHERPA_ONNX_VERSION}-cp39-cp39-macosx_10_14_universal2.whl +macos_wheel_filename=sherpa_onnx-${SHERPA_ONNX_VERSION}-cp39-cp39-macosx_11_0_universal2.whl macos_wheel=$src_dir/$macos_wheel_filename windows_x64_wheel_filename=sherpa_onnx-${SHERPA_ONNX_VERSION}-cp38-cp38-win_amd64.whl diff --git a/sherpa-onnx/flutter/CHANGELOG.md b/sherpa-onnx/flutter/CHANGELOG.md index 1e583389..5f912155 100644 --- a/sherpa-onnx/flutter/CHANGELOG.md +++ b/sherpa-onnx/flutter/CHANGELOG.md @@ -1,3 +1,7 @@ +## 1.9.30 + +* Add TTS + ## 1.9.29 * Publish with CI diff --git a/sherpa-onnx/flutter/lib/sherpa_onnx.dart b/sherpa-onnx/flutter/lib/sherpa_onnx.dart index 8cf2b16c..0a244561 100644 --- a/sherpa-onnx/flutter/lib/sherpa_onnx.dart +++ b/sherpa-onnx/flutter/lib/sherpa_onnx.dart @@ -25,7 +25,7 @@ final DynamicLibrary _dylib = () { if (_path == null) { return DynamicLibrary.open('libsherpa-onnx-c-api.dylib'); } else { - return DynamicLibrary.open('${_path}/libsherpa-onnx-c-api.dylib'); + return DynamicLibrary.open('$_path/libsherpa-onnx-c-api.dylib'); } } @@ -33,7 +33,7 @@ final DynamicLibrary _dylib = () { if (_path == null) { return DynamicLibrary.open('libsherpa-onnx-c-api.so'); } else { - return DynamicLibrary.open('${_path}/libsherpa-onnx-c-api.so'); + return DynamicLibrary.open('$_path/libsherpa-onnx-c-api.so'); } } @@ -41,7 +41,7 @@ final DynamicLibrary _dylib = () { if (_path == null) { return DynamicLibrary.open('sherpa-onnx-c-api.dll'); } else { - return DynamicLibrary.open('${_path}\\sherpa-onnx-c-api.dll'); + return DynamicLibrary.open('$_path\\sherpa-onnx-c-api.dll'); } } diff --git a/sherpa-onnx/flutter/lib/src/online_stream.dart b/sherpa-onnx/flutter/lib/src/online_stream.dart index 29b19622..e1f61e15 100644 --- a/sherpa-onnx/flutter/lib/src/online_stream.dart +++ b/sherpa-onnx/flutter/lib/src/online_stream.dart @@ -34,7 +34,7 @@ class OnlineStream { } void inputFinished() { - SherpaOnnxBindings.onlineStreamInputFinished?.call(this.ptr); + SherpaOnnxBindings.onlineStreamInputFinished?.call(ptr); } Pointer ptr; diff --git a/sherpa-onnx/flutter/lib/src/speaker_identification.dart b/sherpa-onnx/flutter/lib/src/speaker_identification.dart index 0e01044f..5c2e1074 100644 --- a/sherpa-onnx/flutter/lib/src/speaker_identification.dart +++ b/sherpa-onnx/flutter/lib/src/speaker_identification.dart @@ -71,7 +71,7 @@ class SpeakerEmbeddingExtractor { bool isReady(OnlineStream stream) { final int ready = SherpaOnnxBindings.speakerEmbeddingExtractorIsReady - ?.call(this.ptr, stream.ptr) ?? + ?.call(ptr, stream.ptr) ?? 0; return ready == 1; } @@ -79,15 +79,15 @@ class SpeakerEmbeddingExtractor { Float32List compute(OnlineStream stream) { final Pointer embedding = SherpaOnnxBindings .speakerEmbeddingExtractorComputeEmbedding - ?.call(this.ptr, stream.ptr) ?? + ?.call(ptr, stream.ptr) ?? nullptr; if (embedding == nullptr) { return Float32List(0); } - final embeddingList = embedding.asTypedList(this.dim); - final ans = Float32List(this.dim); + final embeddingList = embedding.asTypedList(dim); + final ans = Float32List(dim); ans.setAll(0, embeddingList); SherpaOnnxBindings.speakerEmbeddingExtractorDestroyEmbedding @@ -111,13 +111,13 @@ class SpeakerEmbeddingManager { } void free() { - SherpaOnnxBindings.destroySpeakerEmbeddingManager?.call(this.ptr); - this.ptr = nullptr; + SherpaOnnxBindings.destroySpeakerEmbeddingManager?.call(ptr); + ptr = nullptr; } /// Return true if added successfully; return false otherwise bool add({required String name, required Float32List embedding}) { - assert(embedding.length == this.dim, '${embedding.length} vs ${this.dim}'); + assert(embedding.length == dim, '${embedding.length} vs $dim'); final Pointer namePtr = name.toNativeUtf8(); final int n = embedding.length; @@ -126,9 +126,9 @@ class SpeakerEmbeddingManager { final pList = p.asTypedList(n); pList.setAll(0, embedding); - final int ok = SherpaOnnxBindings.speakerEmbeddingManagerAdd - ?.call(this.ptr, namePtr, p) ?? - 0; + final int ok = + SherpaOnnxBindings.speakerEmbeddingManagerAdd?.call(ptr, namePtr, p) ?? + 0; calloc.free(p); calloc.free(namePtr); @@ -141,19 +141,19 @@ class SpeakerEmbeddingManager { final Pointer namePtr = name.toNativeUtf8(); final int n = embeddingList.length; - final Pointer p = calloc(n * this.dim); - final pList = p.asTypedList(n * this.dim); + final Pointer p = calloc(n * dim); + final pList = p.asTypedList(n * dim); int offset = 0; for (final e in embeddingList) { - assert(e.length == this.dim, '${e.length} vs ${this.dim}'); + assert(e.length == dim, '${e.length} vs $dim'); pList.setAll(offset, e); - offset += this.dim; + offset += dim; } final int ok = SherpaOnnxBindings.speakerEmbeddingManagerAddListFlattened - ?.call(this.ptr, namePtr, p, n) ?? + ?.call(ptr, namePtr, p, n) ?? 0; calloc.free(p); @@ -166,7 +166,7 @@ class SpeakerEmbeddingManager { final Pointer namePtr = name.toNativeUtf8(); final int found = SherpaOnnxBindings.speakerEmbeddingManagerContains - ?.call(this.ptr, namePtr) ?? + ?.call(ptr, namePtr) ?? 0; calloc.free(namePtr); @@ -177,9 +177,9 @@ class SpeakerEmbeddingManager { bool remove(String name) { final Pointer namePtr = name.toNativeUtf8(); - final int ok = SherpaOnnxBindings.speakerEmbeddingManagerRemove - ?.call(this.ptr, namePtr) ?? - 0; + final int ok = + SherpaOnnxBindings.speakerEmbeddingManagerRemove?.call(ptr, namePtr) ?? + 0; calloc.free(namePtr); @@ -188,14 +188,14 @@ class SpeakerEmbeddingManager { /// Return an empty string if no speaker is found String search({required Float32List embedding, required double threshold}) { - assert(embedding.length == this.dim); + assert(embedding.length == dim); - final Pointer p = calloc(this.dim); - final pList = p.asTypedList(this.dim); + final Pointer p = calloc(dim); + final pList = p.asTypedList(dim); pList.setAll(0, embedding); final Pointer name = SherpaOnnxBindings.speakerEmbeddingManagerSearch - ?.call(this.ptr, p, threshold) ?? + ?.call(ptr, p, threshold) ?? nullptr; calloc.free(p); @@ -215,16 +215,16 @@ class SpeakerEmbeddingManager { {required String name, required Float32List embedding, required double threshold}) { - assert(embedding.length == this.dim); + assert(embedding.length == dim); final Pointer namePtr = name.toNativeUtf8(); - final Pointer p = calloc(this.dim); - final pList = p.asTypedList(this.dim); + final Pointer p = calloc(dim); + final pList = p.asTypedList(dim); pList.setAll(0, embedding); final int ok = SherpaOnnxBindings.speakerEmbeddingManagerVerify - ?.call(this.ptr, namePtr, p, threshold) ?? + ?.call(ptr, namePtr, p, threshold) ?? 0; calloc.free(p); @@ -234,19 +234,17 @@ class SpeakerEmbeddingManager { } int get numSpeakers => - SherpaOnnxBindings.speakerEmbeddingManagerNumSpeakers?.call(this.ptr) ?? - 0; + SherpaOnnxBindings.speakerEmbeddingManagerNumSpeakers?.call(ptr) ?? 0; List get allSpeakerNames { - int n = this.numSpeakers; + int n = numSpeakers; if (n == 0) { return []; } - final Pointer> names = SherpaOnnxBindings - .speakerEmbeddingManagerGetAllSpeakers - ?.call(this.ptr) ?? - nullptr; + final Pointer> names = + SherpaOnnxBindings.speakerEmbeddingManagerGetAllSpeakers?.call(ptr) ?? + nullptr; if (names == nullptr) { return []; diff --git a/sherpa-onnx/flutter/lib/src/tts.dart b/sherpa-onnx/flutter/lib/src/tts.dart index 76e00a44..ad304df2 100644 --- a/sherpa-onnx/flutter/lib/src/tts.dart +++ b/sherpa-onnx/flutter/lib/src/tts.dart @@ -1,5 +1,4 @@ // Copyright (c) 2024 Xiaomi Corporation -import 'dart:convert'; import 'dart:ffi'; import 'dart:typed_data'; @@ -184,11 +183,10 @@ class OfflineTts { return GeneratedAudio(samples: newSamples, sampleRate: sampleRate); } - int get sampleRate => - SherpaOnnxBindings.offlineTtsSampleRate?.call(this.ptr) ?? 0; + int get sampleRate => SherpaOnnxBindings.offlineTtsSampleRate?.call(ptr) ?? 0; int get numSpeakers => - SherpaOnnxBindings.offlineTtsNumSpeakers?.call(this.ptr) ?? 0; + SherpaOnnxBindings.offlineTtsNumSpeakers?.call(ptr) ?? 0; Pointer ptr; OfflineTtsConfig config; diff --git a/sherpa-onnx/flutter/lib/src/vad.dart b/sherpa-onnx/flutter/lib/src/vad.dart index 7f8b412a..6c36cd8f 100644 --- a/sherpa-onnx/flutter/lib/src/vad.dart +++ b/sherpa-onnx/flutter/lib/src/vad.dart @@ -76,14 +76,14 @@ class CircularBuffer { final pList = p.asTypedList(n); pList.setAll(0, data); - SherpaOnnxBindings.circularBufferPush?.call(this.ptr, p, n); + SherpaOnnxBindings.circularBufferPush?.call(ptr, p, n); calloc.free(p); } Float32List get({required int startIndex, required int n}) { final Pointer p = - SherpaOnnxBindings.circularBufferGet?.call(this.ptr, startIndex, n) ?? + SherpaOnnxBindings.circularBufferGet?.call(ptr, startIndex, n) ?? nullptr; if (p == nullptr) { @@ -99,11 +99,11 @@ class CircularBuffer { } void pop(int n) { - SherpaOnnxBindings.circularBufferPop?.call(this.ptr, n); + SherpaOnnxBindings.circularBufferPop?.call(ptr, n); } void reset() { - SherpaOnnxBindings.circularBufferReset?.call(this.ptr); + SherpaOnnxBindings.circularBufferReset?.call(ptr); } int get size => SherpaOnnxBindings.circularBufferSize?.call(ptr) ?? 0;