///////////////////////////////////////////////////////////////////////////////
// Simple x264 Launcher
-// Copyright (C) 2004-2014 LoRd_MuldeR <MuldeR2@GMX.de>
+// Copyright (C) 2004-2016 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
///////////////////////////////////////////////////////////////////////////////
#include "win_help.h"
-#include "uic_win_help.h"
+#include "UIC_win_help.h"
+//Internal
#include "global.h"
#include "model_options.h"
-#include "binaries.h"
+#include "model_sysinfo.h"
+#include "model_preferences.h"
+#include "encoder_factory.h"
+#include "source_factory.h"
+//MUtils
+#include <MUtils/Sound.h>
+
+//Qt
#include <QProcess>
#include <QScrollBar>
#include <QTimer>
if(!m_avs2yuv)
{
- m_process->start(ENC_BINARY(m_sysinfo, m_options), QStringList() << "--version");
+ m_process->start(EncoderFactory::getEncoderInfo(m_options->encType()).getBinaryPath(m_sysinfo, m_options->encArch(), m_options->encVariant()), QStringList() << "--version");
}
else
{
- m_process->start(AVS_BINARY(m_sysinfo, m_preferences), QStringList());
+ m_process->start(SourceFactory::getSourceInfo(SourceFactory::SourceType_AVS).getBinaryPath(m_sysinfo, m_preferences->getPrefer64BitSource() && m_sysinfo->getCPUFeatures(SysinfoModel::CPUFeatures_X64)), QStringList());
}
if(!m_process->waitForStarted())
if(m_process->state() != QProcess::NotRunning)
{
e->ignore();
- x264_beep(x264_beep_warning);
+ MUtils::Sound::beep(MUtils::Sound::BEEP_WRN);
return;
}
m_startAgain = false;
if(!m_avs2yuv)
{
- m_process->start(ENC_BINARY(m_sysinfo, m_options), QStringList() << "--fullhelp");
+ m_process->start(EncoderFactory::getEncoderInfo(m_options->encType()).getBinaryPath(m_sysinfo, m_options->encArch(), m_options->encVariant()), QStringList() << "--fullhelp");
ui->plainTextEdit->appendPlainText("\n--------\n");
if(!m_process->waitForStarted())