From 815504b44919ac73923359e12aa29fb409cefda2 Mon Sep 17 00:00:00 2001 From: Dominik Wenger Date: Fri, 14 Dec 2007 19:26:54 +0000 Subject: rbutil: added builtin rbspeex encoder. Reworked encoder configuration. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15925 a1c6a512-1295-4272-9138-f99709370657 --- rbutil/rbutilqt/installtalkwindow.cpp | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) (limited to 'rbutil/rbutilqt/installtalkwindow.cpp') diff --git a/rbutil/rbutilqt/installtalkwindow.cpp b/rbutil/rbutilqt/installtalkwindow.cpp index bd05911035..9b8b5d943a 100644 --- a/rbutil/rbutilqt/installtalkwindow.cpp +++ b/rbutil/rbutilqt/installtalkwindow.cpp @@ -114,6 +114,7 @@ void InstallTalkWindow::accept() userSettings->sync(); + talkcreator->setUserSettings(userSettings); talkcreator->setDir(QDir(folderToTalk)); talkcreator->setMountPoint(userSettings->value("mountpoint").toString()); talkcreator->setTTSexe(pathTTS); @@ -121,11 +122,6 @@ void InstallTalkWindow::accept() talkcreator->setTTsLanguage(ttsLanguage); talkcreator->setTTsType(ttsType); talkcreator->setTTsTemplate(ttsTemplate); - - talkcreator->setEncexe(pathEncoder); - talkcreator->setEncOpts(encOpts); - talkcreator->setEncTemplate(encTemplate); - talkcreator->setEncType(encType); talkcreator->setOverwriteTalk(ui.OverwriteTalk->isChecked()); talkcreator->setOverwriteWav(ui.OverwriteWav->isChecked()); @@ -152,17 +148,16 @@ void InstallTalkWindow::setDeviceSettings(QSettings *dev) .arg(devices->value(profile, tr("Invalid TTS profile!")).toString())); qDebug() << profile; devices->endGroup(); - profile = userSettings->value("encpreset", "none").toString(); - devices->beginGroup("encoders"); - ui.labelEncProfile->setText(tr("Encoder Profile: %1") - .arg(devices->value(profile, tr("Invalid encoder profile!")).toString())); - qDebug() << profile; - devices->endGroup(); + + QString encoder = userSettings->value("encoder", "none").toString(); + EncBase* enc = getEncoder(encoder); + enc->setUserCfg(userSettings); + if(enc->configOk()) + ui.labelEncProfile->setText(tr("Selected Encoder: %1").arg(encoder)); + else + ui.labelEncProfile->setText(tr("Selected Encoder: %1").arg("Invalid encoder configuration!")); } - - - void InstallTalkWindow::setUserSettings(QSettings *user) { userSettings = user; -- cgit v1.2.3