summaryrefslogtreecommitdiffstats
path: root/rbutil/rbutilqt/installtalkwindow.cpp
diff options
context:
space:
mode:
authorDominik Wenger <domonoky@googlemail.com>2007-12-14 19:26:54 +0000
committerDominik Wenger <domonoky@googlemail.com>2007-12-14 19:26:54 +0000
commit815504b44919ac73923359e12aa29fb409cefda2 (patch)
tree1247110323388df365c80da86063d75b5a438eb3 /rbutil/rbutilqt/installtalkwindow.cpp
parented047d9db1dcee92afb8fe6bacb5d90ccb39481e (diff)
downloadrockbox-815504b44919ac73923359e12aa29fb409cefda2.tar.gz
rockbox-815504b44919ac73923359e12aa29fb409cefda2.tar.bz2
rockbox-815504b44919ac73923359e12aa29fb409cefda2.zip
rbutil: added builtin rbspeex encoder. Reworked encoder configuration.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15925 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'rbutil/rbutilqt/installtalkwindow.cpp')
-rw-r--r--rbutil/rbutilqt/installtalkwindow.cpp23
1 files changed, 9 insertions, 14 deletions
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: <b>%1</b>")
- .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: <b>%1</b>").arg(encoder));
+ else
+ ui.labelEncProfile->setText(tr("Selected Encoder: <b>%1</b>").arg("Invalid encoder configuration!"));
}
-
-
-
void InstallTalkWindow::setUserSettings(QSettings *user)
{
userSettings = user;