From fce6ac31ffd3f3f12f4ac326287b1bb449d231e1 Mon Sep 17 00:00:00 2001 From: lordmulder Date: Sat, 15 Feb 2014 00:13:22 +0100 Subject: [PATCH] Disable selection of x265 in "add job" dialog for now. Will be re-enabled when it's actually supported. --- src/binaries.cpp | 3 ++- src/win_addJob.cpp | 8 ++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/binaries.cpp b/src/binaries.cpp index b3a8a0a..ccdc875 100644 --- a/src/binaries.cpp +++ b/src/binaries.cpp @@ -74,7 +74,8 @@ QString ENC_BINARY(const SysinfoModel *sysinfo, const OptionsModel *options) QString AVS_BINARY(const SysinfoModel *sysinfo, const PreferencesModel *preferences) { - return QString("%1/toolset/%2/avs2yuv_%2.exe").arg(sysinfo->getAppPath(), preferences->getUseAvisyth64Bit() ? "x64": "x86"); + const bool x64 = preferences->getUseAvisyth64Bit() && sysinfo->hasX64Support(); + return QString("%1/toolset/%2/avs2yuv_%2.exe").arg(sysinfo->getAppPath(), x64 ? "x64": "x86"); } QString VPS_BINARY(const SysinfoModel *sysinfo, const PreferencesModel *preferences) diff --git a/src/win_addJob.cpp b/src/win_addJob.cpp index af92f05..4a8ac0e 100644 --- a/src/win_addJob.cpp +++ b/src/win_addJob.cpp @@ -460,6 +460,14 @@ void AddJobDialog::modeIndexChanged(int index) void AddJobDialog::accept(void) { + //FIXME + if(ui->cbxEncoderType->currentIndex() == OptionsModel::EncType_X265) + { + QMessageBox::warning(this, tr("x265"), tr("Sorry, x265 support not implemented yet!")); + ui->cbxEncoderType->setCurrentIndex(OptionsModel::EncType_X264); + return; + } + //Check 64-Bit support if((ui->cbxEncoderArch->currentIndex() == OptionsModel::EncArch_x64) && (!m_sysinfo->hasX64Support())) {