Muldersoft/Simple-x264-Launcher
Muldersoft/Simple-x264-Launcher
1
0
Fork 0
Code Releases 1 Activity

Added backward compatibility for "old" template entries.

Browse Source
This commit is contained in:
LoRd_MuldeR 2014-08-13 15:38:17 +02:00
parent 2179dd9371
commit 9ac2aa911b
2 changed files with 36 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/model_options.cpp
View File

@ -155,11 +155,11 @@ bool OptionsModel::loadTemplate(OptionsModel *model, const QString &name)
} }
QSettings settings(QString("%1/templates.ini").arg(appDir), QSettings::IniFormat); QSettings settings(QString("%1/templates.ini").arg(appDir), QSettings::IniFormat);
settings.beginGroup(name); settings.beginGroup(name);
const bool okay = loadOptions(model, settings); const bool okay = loadOptions(model, settings);
settings.endGroup(); settings.endGroup();
return okay; return okay;
} }
@ -229,27 +229,9 @@ bool OptionsModel::saveOptions(const OptionsModel *model, QSettings &settingsFil
bool OptionsModel::loadOptions(OptionsModel *model, QSettings &settingsFile) bool OptionsModel::loadOptions(OptionsModel *model, QSettings &settingsFile)
{ {
//For backward-compatibility fixTemplate(settingsFile); /*for backward compatibility*/
static const char *legacyKey[] = { "custom_params", "custom_params_x264", NULL };
for(int i = 0; legacyKey[i]; i++)
{
if(settingsFile.contains(legacyKey[i]))
{
settingsFile.setValue(KEY_CUSTOM_ENCODER, settingsFile.value(legacyKey[i]));
settingsFile.remove(legacyKey[i]);
}
}
if(settingsFile.value(KEY_PROFILE_NAME).toString().compare("auto", Qt::CaseInsensitive) == 0)
{
settingsFile.setValue(KEY_PROFILE_NAME, QString::fromLatin1(OptionsModel::PROFILE_UNRESTRICTED));
}
if(settingsFile.value(KEY_TUNING_NAME).toString().compare("none", Qt::CaseInsensitive) == 0)
{
settingsFile.setValue(KEY_TUNING_NAME, QString::fromLatin1(OptionsModel::TUNING_UNSPECIFIED));
}
bool complete = true; bool complete = true;
if(!settingsFile.contains(KEY_ENCODER_TYPE)) complete = false; if(!settingsFile.contains(KEY_ENCODER_TYPE)) complete = false;
if(!settingsFile.contains(KEY_ENCODER_ARCH)) complete = false; if(!settingsFile.contains(KEY_ENCODER_ARCH)) complete = false;
if(!settingsFile.contains(KEY_ENCODER_VARIANT)) complete = false; if(!settingsFile.contains(KEY_ENCODER_VARIANT)) complete = false;
@ -279,3 +261,32 @@ bool OptionsModel::loadOptions(OptionsModel *model, QSettings &settingsFile)
return complete; return complete;
} }
void OptionsModel::fixTemplate(QSettings &settingsFile)
{
if(!(settingsFile.contains(KEY_ENCODER_TYPE) || settingsFile.contains(KEY_ENCODER_ARCH) || settingsFile.contains(KEY_ENCODER_VARIANT)))
{
settingsFile.setValue(KEY_ENCODER_TYPE, OptionsModel::EncType_X264);
settingsFile.setValue(KEY_ENCODER_ARCH, OptionsModel::EncArch_x32);
settingsFile.setValue(KEY_ENCODER_VARIANT, OptionsModel::EncVariant_LoBit);
}
static const char *legacyKey[] = { "custom_params", "custom_params_x264", NULL };
for(int i = 0; legacyKey[i]; i++)
{
if(settingsFile.contains(legacyKey[i]))
{
settingsFile.setValue(KEY_CUSTOM_ENCODER, settingsFile.value(legacyKey[i]));
settingsFile.remove(legacyKey[i]);
}
}
if(settingsFile.value(KEY_PROFILE_NAME).toString().compare("auto", Qt::CaseInsensitive) == 0)
{
settingsFile.setValue(KEY_PROFILE_NAME, QString::fromLatin1(OptionsModel::PROFILE_UNRESTRICTED));
}
if(settingsFile.value(KEY_TUNING_NAME).toString().compare("none", Qt::CaseInsensitive) == 0)
{
settingsFile.setValue(KEY_TUNING_NAME, QString::fromLatin1(OptionsModel::TUNING_UNSPECIFIED));
}
}

3
src/model_options.h
View File

@ -115,4 +115,7 @@ protected:
QString m_profile; QString m_profile;
QString m_custom_encoder; QString m_custom_encoder;
QString m_custom_avs2yuv; QString m_custom_avs2yuv;
private:
static void fixTemplate(QSettings &settingsFile);
}; };