diff --git a/gui/win_help.ui b/gui/win_help.ui index 5dddb96..20ad2d9 100644 --- a/gui/win_help.ui +++ b/gui/win_help.ui @@ -32,20 +32,20 @@ 48 - 40 + 48 48 - 40 + 48 - :/images/x264.png + :/images/help.png true diff --git a/res/images/help.png b/res/images/help.png new file mode 100644 index 0000000..9213d24 Binary files /dev/null and b/res/images/help.png differ diff --git a/res/resources.qrc b/res/resources.qrc index d352319..670b160 100644 --- a/res/resources.qrc +++ b/res/resources.qrc @@ -56,6 +56,7 @@ buttons/x264.png buttons/x265.png images/avisynth.png + images/help.png images/loading.gif images/movie.png images/nvencc.png diff --git a/src/encoder_abstract.h b/src/encoder_abstract.h index 3cbb9ce..5953e51 100644 --- a/src/encoder_abstract.h +++ b/src/encoder_abstract.h @@ -63,6 +63,7 @@ public: virtual bool isInputTypeSupported(const int format) const = 0; virtual QString getBinaryPath(const SysinfoModel *sysinfo, const quint32 &encArch, const quint32 &encVariant) const = 0; virtual QStringList getDependencies(const SysinfoModel *sysinfo, const quint32 &encArch, const quint32 &encVariant) const; + virtual QString getHelpCommand(void) const = 0; //Utilities QString archToString (const quint32 &index) const; diff --git a/src/encoder_nvenc.cpp b/src/encoder_nvenc.cpp index e19035f..2fa478b 100644 --- a/src/encoder_nvenc.cpp +++ b/src/encoder_nvenc.cpp @@ -198,6 +198,11 @@ public: << QString("%1/toolset/%2/avutil-55.dll" ).arg(sysinfo->getAppPath(), arch) << QString("%1/toolset/%2/swresample-2.dll").arg(sysinfo->getAppPath(), arch); } + + virtual QString getHelpCommand(void) const + { + return "--help"; + } }; static const NVEncEncoderInfo s_nvencEncoderInfo; diff --git a/src/encoder_x264.cpp b/src/encoder_x264.cpp index 2145d08..770a2cd 100644 --- a/src/encoder_x264.cpp +++ b/src/encoder_x264.cpp @@ -179,6 +179,11 @@ public: } return QString("%1/toolset/%2/x264_%3_%2.exe").arg(sysinfo->getAppPath(), arch, variant); } + + virtual QString getHelpCommand(void) const + { + return "--fullhelp"; + } }; static const X264EncoderInfo s_x264EncoderInfo; diff --git a/src/encoder_x265.cpp b/src/encoder_x265.cpp index f960b54..4601065 100644 --- a/src/encoder_x265.cpp +++ b/src/encoder_x265.cpp @@ -175,6 +175,11 @@ public: } return QString("%1/toolset/%2/x265_%3_%2.exe").arg(sysinfo->getAppPath(), arch, variant); } + + virtual QString getHelpCommand(void) const + { + return "--fullhelp"; + } }; static const X265EncoderInfo s_x265EncoderInfo; diff --git a/src/win_help.cpp b/src/win_help.cpp index d1c898a..23ed839 100644 --- a/src/win_help.cpp +++ b/src/win_help.cpp @@ -138,7 +138,8 @@ void HelpDialog::finished(void) m_startAgain = false; if(!m_avs2yuv) { - m_process->start(EncoderFactory::getEncoderInfo(m_options->encType()).getBinaryPath(m_sysinfo, m_options->encArch(), m_options->encVariant()), QStringList() << "--fullhelp"); + const AbstractEncoderInfo &encInfo = EncoderFactory::getEncoderInfo(m_options->encType()); + m_process->start(encInfo.getBinaryPath(m_sysinfo, m_options->encArch(), m_options->encVariant()), QStringList() << encInfo.getHelpCommand()); ui->plainTextEdit->appendPlainText("\n--------\n"); if(!m_process->waitForStarted())