[flutter_tts] Update flutter_tts to 4.2.5 (#984)

Author: JSUYA

packages/flutter_tts/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 1.6.0
+
+* Update flutter_tts 4.2.0 to 4.2.5.
+* Invoke `speak.onError` when the Tizen TTS engine reports an error.
+* Update the example app and integration_test.
+
 ## 1.5.1
 
 * Update code format.

packages/flutter_tts/README.md

@@ -10,8 +10,8 @@ This package is not an _endorsed_ implementation of `flutter_tts`. Therefore, yo
 
 ```yaml
 dependencies:
-  flutter_tts: ^4.2.0
-  flutter_tts_tizen: ^1.5.1
+  flutter_tts: ^4.2.5
+  flutter_tts_tizen: ^1.6.0
 ```
 
 Then you can import `flutter_tts` in your Dart code:

packages/flutter_tts/example/pubspec.yaml

@@ -9,7 +9,7 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
-  flutter_tts: ^4.2.0
+  flutter_tts: ^4.2.5
   flutter_tts_tizen:
     path: ../
 

packages/flutter_tts/pubspec.yaml

@@ -2,7 +2,7 @@ name: flutter_tts_tizen
 description: The Tizen implementation of flutter_tts plugin.
 homepage: https://github.com/flutter-tizen/plugins
 repository: https://github.com/flutter-tizen/plugins/tree/master/packages/flutter_tts
-version: 1.5.1
+version: 1.6.0
 
 environment:
   sdk: ">=3.1.0 <4.0.0"

packages/flutter_tts/tizen/src/flutter_tts_tizen_plugin.cc

@@ -52,10 +52,6 @@ class FlutterTtsTizenPlugin : public flutter::Plugin {
     });
 
     tts_ = std::make_unique<TextToSpeech>();
-    if (!tts_->Initialize()) {
-      tts_ = nullptr;
-      return;
-    }
     tts_->SetStateChanagedCallback([this](TtsState previous, TtsState current) {
       std::unique_ptr<flutter::EncodableValue> value =
           std::make_unique<flutter::EncodableValue>(true);
@@ -83,6 +79,16 @@ class FlutterTtsTizenPlugin : public flutter::Plugin {
       channel_->InvokeMethod("speak.onComplete", std::move(args));
       HandleAwaitSpeakCompletion(flutter::EncodableValue(1));
     });
+    tts_->SetErrorCallback([this](const std::string &message) {
+      std::unique_ptr<flutter::EncodableValue> args =
+          std::make_unique<flutter::EncodableValue>(message);
+      channel_->InvokeMethod("speak.onError", std::move(args));
+      HandleAwaitSpeakCompletion(flutter::EncodableValue(0));
+    });
+    if (!tts_->Initialize()) {
+      tts_ = nullptr;
+      return;
+    }
   }
 
   virtual ~FlutterTtsTizenPlugin() {}
@@ -196,7 +202,10 @@ class FlutterTtsTizenPlugin : public flutter::Plugin {
       rate = std::min(rate, 1.0);
       // Scale the value to be between the supported range.
       int32_t min = 0, normal = 0, max = 0;
-      tts_->GetSpeedRange(&min, &normal, &max);
+      if (!tts_->GetSpeedRange(&min, &normal, &max) || max < min) {
+        SendResult(flutter::EncodableValue(0));
+        return;
+      }
       int32_t speed = min + (max - min) * rate;
       tts_->SetTtsSpeed(speed);
       SendResult(flutter::EncodableValue(1));
@@ -304,7 +313,7 @@ class FlutterTtsTizenPlugin : public flutter::Plugin {
   }
 
   void HandleAwaitSpeakCompletion(const flutter::EncodableValue &result) {
-    if (await_speak_completion_) {
+    if (await_speak_completion_ && result_for_await_speak_completion_) {
       result_for_await_speak_completion_->Success(result);
       result_for_await_speak_completion_ = nullptr;
     }

packages/flutter_tts/tizen/src/text_to_speech.cc

@@ -128,7 +128,19 @@ void TextToSpeech::RegisterCallbacks() {
   tts_set_error_cb(
       tts_,
       [](tts_h tts, int32_t utt_id, tts_error_e reason, void *user_data) {
+        TextToSpeech *self = static_cast<TextToSpeech *>(user_data);
         LOG_ERROR("TTS error: utt_id(%d), reason(%d)", utt_id, reason);
+        self->ClearUttId();
+        if (self->error_callback_) {
+          char *error_message = nullptr;
+          int ret = tts_get_error_message(tts, &error_message);
+          if (ret == TTS_ERROR_NONE && error_message) {
+            self->error_callback_(error_message);
+            free(error_message);
+          } else {
+            self->error_callback_(get_error_message(reason));
+          }
+        }
       },
       this);
 }

packages/flutter_tts/tizen/src/text_to_speech.h

@@ -18,6 +18,7 @@ enum class TtsState { kCreated, kReady, kPlaying, kPaused };
 using StateChangedCallback =
     std::function<void(TtsState previous, TtsState current)>;
 using UtteranceCompletedCallback = std::function<void(int32_t utt_id)>;
+using ErrorCallback = std::function<void(const std::string &message)>;
 
 class TextToSpeech {
  public:
@@ -35,6 +36,8 @@ class TextToSpeech {
     utterance_completed_callback_ = callback;
   }
 
+  void SetErrorCallback(ErrorCallback callback) { error_callback_ = callback; }
+
   std::string GetDefaultLanguage() { return default_language_; }
 
   void SetDefaultLanguage(const std::string &language) {
@@ -102,6 +105,7 @@ class TextToSpeech {
 
   StateChangedCallback state_changed_callback_;
   UtteranceCompletedCallback utterance_completed_callback_;
+  ErrorCallback error_callback_;
 };
 
 #endif  // FLUTTER_PLUGIN_TEXT_TO_SPEACH_H_