Updated copyright year.

[x264-launcher/x264-launcher.git] / src / model_options.cpp

diff --git a/src/model_options.cpp b/src/model_options.cpp
index 370487f..9591398 100644 (file)
--- a/src/model_options.cpp
+++ b/src/model_options.cpp
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 // Simple x264 Launcher
-// Copyright (C) 2004-2015 LoRd_MuldeR <MuldeR2@GMX.de>
+// Copyright (C) 2004-2022 LoRd_MuldeR <MuldeR2@GMX.de>
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -51,19 +51,19 @@ static const char *KEY_PROFILE_NAME    = "profile_name";
 static const char *KEY_CUSTOM_ENCODER  = "custom_params_encoder";
 static const char *KEY_CUSTOM_AVS2YUV  = "custom_params_avs2yuv";
 
-const char *const OptionsModel::TUNING_UNSPECIFIED   = "<None>";
+const char *const OptionsModel::SETTING_UNSPECIFIED   = "<None>";
 const char *const OptionsModel::PROFILE_UNRESTRICTED = "<Unrestricted>";
 
 OptionsModel::OptionsModel(const SysinfoModel *sysinfo)
 {
        m_encoderType = EncType_X264;
-       m_encoderArch = sysinfo->getCPUFeatures(SysinfoModel::CPUFeatures_X64) ? EncArch_x86_64 : EncArch_x86_32;
-       m_encoderVariant = EncVariant_8Bit;
-       m_rcMode = RCMode_CRF;
+       m_encoderArch = sysinfo->getCPUFeatures(SysinfoModel::CPUFeatures_X64) ? 0 : 1;
+       m_encoderVariant = 0;
+       m_rcMode = 0;
        m_bitrate = 1200;
        m_quantizer = 22;
        m_preset = "Medium";
-       m_tune = QString::fromLatin1(OptionsModel::TUNING_UNSPECIFIED);
+       m_tune = QString::fromLatin1(OptionsModel::SETTING_UNSPECIFIED);
        m_profile = QString::fromLatin1(OptionsModel::PROFILE_UNRESTRICTED);
        m_custom_encoder = QString();
        m_custom_avs2yuv = QString();
@@ -88,28 +88,6 @@ OptionsModel::~OptionsModel(void)
 {
 }
 
-QString OptionsModel::rcMode2String(RCMode mode)
-{
-       switch(mode)
-       {
-       case RCMode_CRF:
-               return QObject::tr("CRF");
-               break;
-       case RCMode_CQ:
-               return QObject::tr("CQ");
-               break;
-       case RCMode_2Pass:
-               return QObject::tr("2-Pass");
-               break;
-       case RCMode_ABR:
-               return QObject::tr("ABR");
-               break;
-       default:
-               return QString();
-               break;
-       }
-}
-
 bool OptionsModel::equals(const OptionsModel *model)
 {
        bool equal = true;
@@ -251,17 +229,17 @@ bool OptionsModel::loadOptions(OptionsModel *model, QSettings &settingsFile)
 
        if(complete)
        {
-               model->setEncType        (static_cast<OptionsModel::EncType>   (settingsFile.value(KEY_ENCODER_TYPE,    model->m_encoderType)   .toInt()));
-               model->setEncArch        (static_cast<OptionsModel::EncArch>   (settingsFile.value(KEY_ENCODER_ARCH,    model->m_encoderArch)   .toInt()));
-               model->setEncVariant     (static_cast<OptionsModel::EncVariant>(settingsFile.value(KEY_ENCODER_VARIANT, model->m_encoderVariant).toInt()));
-               model->setRCMode         (static_cast<OptionsModel::RCMode>    (settingsFile.value(KEY_RATECTRL_MODE,   model->m_rcMode)        .toInt()));
-               model->setBitrate        (settingsFile.value(KEY_TARGET_BITRATE, model->m_bitrate)       .toUInt()  );
-               model->setQuantizer      (settingsFile.value(KEY_TARGET_QUANT,   model->m_quantizer)     .toDouble());
-               model->setPreset         (settingsFile.value(KEY_PRESET_NAME,    model->m_preset)        .toString());
-               model->setTune           (settingsFile.value(KEY_TUNING_NAME,    model->m_tune)          .toString());
-               model->setProfile        (settingsFile.value(KEY_PROFILE_NAME,   model->m_profile)       .toString());
-               model->setCustomEncParams(settingsFile.value(KEY_CUSTOM_ENCODER, model->m_custom_encoder).toString());
-               model->setCustomAvs2YUV  (settingsFile.value(KEY_CUSTOM_AVS2YUV, model->m_custom_avs2yuv).toString());
+               model->setEncType        (settingsFile.value(KEY_ENCODER_TYPE,    model->m_encoderType)   .toInt());
+               model->setEncArch        (settingsFile.value(KEY_ENCODER_ARCH,    model->m_encoderArch)   .toInt());
+               model->setEncVariant     (settingsFile.value(KEY_ENCODER_VARIANT, model->m_encoderVariant).toInt());
+               model->setRCMode         (settingsFile.value(KEY_RATECTRL_MODE,   model->m_rcMode)        .toInt());
+               model->setBitrate        (settingsFile.value(KEY_TARGET_BITRATE,  model->m_bitrate)       .toUInt());
+               model->setQuantizer      (settingsFile.value(KEY_TARGET_QUANT,    model->m_quantizer)     .toDouble());
+               model->setPreset         (settingsFile.value(KEY_PRESET_NAME,     model->m_preset)        .toString());
+               model->setTune           (settingsFile.value(KEY_TUNING_NAME,     model->m_tune)          .toString());
+               model->setProfile        (settingsFile.value(KEY_PROFILE_NAME,    model->m_profile)       .toString());
+               model->setCustomEncParams(settingsFile.value(KEY_CUSTOM_ENCODER,  model->m_custom_encoder).toString());
+               model->setCustomAvs2YUV  (settingsFile.value(KEY_CUSTOM_AVS2YUV,  model->m_custom_avs2yuv).toString());
        }
        
        return complete;
@@ -271,9 +249,9 @@ 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_x86_32);
-               settingsFile.setValue(KEY_ENCODER_VARIANT, OptionsModel::EncVariant_8Bit);
+               settingsFile.setValue(KEY_ENCODER_TYPE,    0);
+               settingsFile.setValue(KEY_ENCODER_ARCH,    0);
+               settingsFile.setValue(KEY_ENCODER_VARIANT, 0);
        }
 
        static const char *legacyKey[] = { "custom_params", "custom_params_x264", NULL };
@@ -292,6 +270,6 @@ void OptionsModel::fixTemplate(QSettings &settingsFile)
        }
        if(settingsFile.value(KEY_TUNING_NAME).toString().compare("none", Qt::CaseInsensitive) == 0)
        {
-               settingsFile.setValue(KEY_TUNING_NAME, QString::fromLatin1(OptionsModel::TUNING_UNSPECIFIED));
+               settingsFile.setValue(KEY_TUNING_NAME, QString::fromLatin1(OptionsModel::SETTING_UNSPECIFIED));
        }
 }