From 586d1a19c19aebdc78ca3c5df370eb1bd8cb7b1d Mon Sep 17 00:00:00 2001 From: lordmulder Date: Sun, 8 May 2016 22:51:10 +0200 Subject: [PATCH] Fixed help screen for NVEncC. --- gui/win_help.ui | 6 +++--- res/images/help.png | Bin 0 -> 7876 bytes res/resources.qrc | 1 + src/encoder_abstract.h | 1 + src/encoder_nvenc.cpp | 5 +++++ src/encoder_x264.cpp | 5 +++++ src/encoder_x265.cpp | 5 +++++ src/win_help.cpp | 3 ++- 8 files changed, 22 insertions(+), 4 deletions(-) create mode 100644 res/images/help.png 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 0000000000000000000000000000000000000000..9213d241f40a9c59332618ccfbc8279da4ba66d0 GIT binary patch literal 7876 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 iYX6%(wnc$f>Hh(5;&K<_pd4}l0000buttons/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()) -- 2.11.4.GIT