devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Clean up accessing system setting values for a specific player.

Browse source 
Remove the ugly "save, change and restore platform" accesses and extend the settings class to allow accessing player specific system values.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22254 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Dominik Riebeling 2009-08-11 17:02:35 +00:00
parent 9a5174c8a3
commit 6cea3308d0
3 changed files with 44 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

44
rbutil/rbutilqt/configure.cpp
View file

@ -367,18 +367,14 @@ void Config::updateTtsState(int index)
void Config::updateEncState()
{
// FIXME: this is a workaround to make the encoder follow the device selection
// even with the settings (and thus the device) being saved. Needs to be redone
// properly later by extending the settings object
if(ui.treeDevices->selectedItems().size() == 0)
return;
QString devname = ui.treeDevices->selectedItems().at(0)->data(0, Qt::UserRole).toString();
QString olddevice = RbSettings::value(RbSettings::Platform).toString();
RbSettings::setValue(RbSettings::Platform, devname);
QString encoder = RbSettings::value(RbSettings::CurEncoder).toString();
ui.encoderName->setText(EncBase::getEncoderName(RbSettings::value(RbSettings::CurEncoder).toString()));
RbSettings::setValue(RbSettings::Platform, olddevice);
QString encoder = RbSettings::platformValue(devname,
RbSettings::CurEncoder).toString();
ui.encoderName->setText(EncBase::getEncoderName(RbSettings::platformValue(devname,
RbSettings::CurEncoder).toString()));
EncBase* enc = EncBase::getEncoder(this,encoder);
@ -673,14 +669,16 @@ void Config::testTts()
TTSBase* tts = TTSBase::getTTS(this,ui.comboTts->itemData(index).toString());
if(!tts->configOk())
{
QMessageBox::warning(this,tr("TTS configuration invalid"),tr("TTS configuration invalid. \n Please configure TTS engine."));
QMessageBox::warning(this,tr("TTS configuration invalid"),
tr("TTS configuration invalid. \n Please configure TTS engine."));
return;
}
if(!tts->start(&errstr))
{
QMessageBox::warning(this,tr("Could not start TTS engine"),tr("Could not start TTS engine.\n") + errstr
+tr("\nPlease configure TTS engine."));
QMessageBox::warning(this,tr("Could not start TTS engine"),
tr("Could not start TTS engine.\n") + errstr
+ tr("\nPlease configure TTS engine."));
return;
}
@ -692,11 +690,12 @@ void Config::testTts()
if(tts->voice(tr("Rockbox Utility Voice Test"),filename,&errstr) == FatalError)
{
tts->stop();
QMessageBox::warning(this,tr("Could not voice test string"),tr("Could not voice test string.\n") + errstr
+tr("\nPlease configure TTS engine."));
QMessageBox::warning(this,tr("Could not voice test string"),
tr("Could not voice test string.\n") + errstr
+ tr("\nPlease configure TTS engine."));
return;
}
tts->stop();
tts->stop();
#if defined(Q_OS_LINUX)
QString exe = findExecutable("aplay");
if(exe == "") exe = findExecutable("play");
@ -704,25 +703,21 @@ void Config::testTts()
{
QProcess::execute(exe+" "+filename);
}
#else
#else
QSound::play(filename);
#endif
#endif
}
void Config::configEnc()
{
// FIXME: this is a workaround to make the encoder follow the device selection
// even with the settings (and thus the device) being saved. Needs to be redone
// properly later by extending the settings object
if(ui.treeDevices->selectedItems().size() == 0)
return;
QString devname = ui.treeDevices->selectedItems().at(0)->data(0, Qt::UserRole).toString();
QString olddevice = RbSettings::value(RbSettings::CurrentPlatform).toString();
RbSettings::setValue(RbSettings::CurrentPlatform,devname);
QString encoder = RbSettings::value(RbSettings::CurEncoder).toString();
ui.encoderName->setText(EncBase::getEncoderName(RbSettings::value(RbSettings::CurEncoder).toString()));
RbSettings::setValue(RbSettings::CurrentPlatform,olddevice);
QString encoder = RbSettings::platformValue(devname,
RbSettings::CurEncoder).toString();
ui.encoderName->setText(EncBase::getEncoderName(RbSettings::platformValue(devname,
RbSettings::CurEncoder).toString()));
EncBase* enc = EncBase::getEncoder(this,encoder);
@ -732,3 +727,4 @@ void Config::configEnc()
updateEncState();
}