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

Disable selection of x265 in "add job" dialog for now. Will be re-enabled when it's actually supported.

Browse Source
This commit is contained in:
LoRd_MuldeR 2014-02-15 00:13:22 +01:00
parent e1c9f86520
commit fce6ac31ff
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/binaries.cpp
View File

@ -74,7 +74,8 @@ QString ENC_BINARY(const SysinfoModel *sysinfo, const OptionsModel *options)
QString AVS_BINARY(const SysinfoModel *sysinfo, const PreferencesModel *preferences) 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) QString VPS_BINARY(const SysinfoModel *sysinfo, const PreferencesModel *preferences)

8
src/win_addJob.cpp
View File

@ -460,6 +460,14 @@ void AddJobDialog::modeIndexChanged(int index)
void AddJobDialog::accept(void) 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 //Check 64-Bit support
if((ui->cbxEncoderArch->currentIndex() == OptionsModel::EncArch_x64) && (!m_sysinfo->hasX64Support())) if((ui->cbxEncoderArch->currentIndex() == OptionsModel::EncArch_x64) && (!m_sysinfo->hasX64Support()))
{ {