From a0218b0b919dc94061d8aeae642de6438560c0e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bartek=20=C5=81ukawski?= Date: Tue, 16 Jan 2024 23:18:40 +0100 Subject: [PATCH] Allow overwriting voice model via config options --- programs/DialogueManager/DialogueManager.cpp | 7 ++++--- programs/DialogueManager/DialogueManager.hpp | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/programs/DialogueManager/DialogueManager.cpp b/programs/DialogueManager/DialogueManager.cpp index b763d81..0d2b9fe 100644 --- a/programs/DialogueManager/DialogueManager.cpp +++ b/programs/DialogueManager/DialogueManager.cpp @@ -48,6 +48,7 @@ bool DialogueManager::configure(yarp::os::ResourceFinder & rf) yInfo("\t--help (this help)\t--from [file.ini]\t--context [path]"); yInfo("\t--language: %s [%s]", language.c_str(), DEFAULT_LANGUAGE); yInfo("\t--backend: %s [%s]", backend.c_str(), DEFAULT_BACKEND); + yInfo("\t--model: (specific for the chosen language and backend)"); return false; } @@ -73,7 +74,7 @@ bool DialogueManager::configure(yarp::os::ResourceFinder & rf) return false; } - voice = group.find("model").asString(); + model = rf.check("model", group.find("model"), "voice model").asString(); for (const auto & label : sentenceLabels) { @@ -172,9 +173,9 @@ bool DialogueManager::close() bool DialogueManager::threadInit() { - if (!tts.setLanguage(voice)) + if (!tts.setLanguage(model)) { - yError() << "Unable to set voice to" << voice; + yError() << "Unable to set model to" << model; return false; } diff --git a/programs/DialogueManager/DialogueManager.hpp b/programs/DialogueManager/DialogueManager.hpp index 5e7bb16..1ca917e 100644 --- a/programs/DialogueManager/DialogueManager.hpp +++ b/programs/DialogueManager/DialogueManager.hpp @@ -51,7 +51,7 @@ class DialogueManager : public yarp::os::RFModule, yarp::os::RpcClient speechPort; yarp::os::RpcClient motionPort; - std::string voice; + std::string model; std::unordered_map sentences; std::atomic demoCompleted {false};