From efc971bafcf0bdfb16fbcffc16c7885fde701a12 Mon Sep 17 00:00:00 2001 From: James Goppert Date: Mon, 21 Feb 2011 11:34:01 -0500 Subject: [PATCH] Flite fixed for unix and cmake. --- CMakeModules/FindFlite.cmake | 13 ++++++++++++- src/GAudioOutput.cc | 2 +- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/CMakeModules/FindFlite.cmake b/CMakeModules/FindFlite.cmake index a4d16bad18..b9471bef39 100644 --- a/CMakeModules/FindFlite.cmake +++ b/CMakeModules/FindFlite.cmake @@ -1,5 +1,16 @@ FIND_PATH(FLITE_INCLUDE_DIR flite/flite.h) -FIND_LIBRARY(FLITE_LIBRARIES NAMES flite) + +FIND_LIBRARY(FLITE_MAIN_LIB NAMES flite) +FIND_LIBRARY(FLITE_CMULEX_LIB NAMES flite_cmulex) +FIND_LIBRARY(FLITE_CMU_US_KAL_LIB NAMES flite_cmu_us_kal) +FIND_LIBRARY(FLITE_US_ENGLISH_LIB NAMES flite_usenglish) + +SET(FLITE_LIBRARIES + ${FLITE_MAIN_LIB} + ${FLITE_CMULEX_LIB} + ${FLITE_CMU_US_KAL_LIB} + ${FLITE_US_ENGLISH_LIB} + ) IF(FLITE_INCLUDE_DIR AND FLITE_LIBRARIES) SET(FLITE_FOUND TRUE) diff --git a/src/GAudioOutput.cc b/src/GAudioOutput.cc index e10356f377..50ef1ecbc6 100644 --- a/src/GAudioOutput.cc +++ b/src/GAudioOutput.cc @@ -189,7 +189,7 @@ bool GAudioOutput::say(QString text, int severity) file.setFileTemplate("XXXXXX.wav"); if (file.open()) { - cst_voice* v = new_voice(); + cst_voice* v = register_cmu_us_kal(NULL); cst_wave* wav = flite_text_to_wave(text.toStdString().c_str(), v); // file.fileName() returns the unique file name cst_wave_save(wav, file.fileName().toStdString().c_str(), "riff"); -- GitLab