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

Fixed help screen for NVEncC.

Browse Source
This commit is contained in:
LoRd_MuldeR 2016-05-08 22:51:10 +02:00
parent 762ccde74c
commit 586d1a19c1
8 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gui/win_help.ui
View File

@ -32,20 +32,20 @@
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>48</width> <width>48</width>
<height>40</height> <height>48</height>
</size> </size>
</property> </property>
<property name="maximumSize"> <property name="maximumSize">
<size> <size>
<width>48</width> <width>48</width>
<height>40</height> <height>48</height>
</size> </size>
</property> </property>
<property name="text"> <property name="text">
<string/> <string/>
</property> </property>
<property name="pixmap"> <property name="pixmap">
<pixmap resource="../res/resources.qrc">:/images/x264.png</pixmap> <pixmap resource="../res/resources.qrc">:/images/help.png</pixmap>
</property> </property>
<property name="scaledContents"> <property name="scaledContents">
<bool>true</bool> <bool>true</bool>

BIN
res/images/help.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.7 KiB

1
res/resources.qrc
View File

@ -56,6 +56,7 @@
<file>buttons/x264.png</file> <file>buttons/x264.png</file>
<file>buttons/x265.png</file> <file>buttons/x265.png</file>
<file>images/avisynth.png</file> <file>images/avisynth.png</file>
<file>images/help.png</file>
<file>images/loading.gif</file> <file>images/loading.gif</file>
<file>images/movie.png</file> <file>images/movie.png</file>
<file>images/nvencc.png</file> <file>images/nvencc.png</file>

1
src/encoder_abstract.h
View File

@ -63,6 +63,7 @@ public:
virtual bool isInputTypeSupported(const int format) const = 0; virtual bool isInputTypeSupported(const int format) const = 0;
virtual QString getBinaryPath(const SysinfoModel *sysinfo, const quint32 &encArch, const quint32 &encVariant) 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 QStringList getDependencies(const SysinfoModel *sysinfo, const quint32 &encArch, const quint32 &encVariant) const;
virtual QString getHelpCommand(void) const = 0;
//Utilities //Utilities
QString archToString (const quint32 &index) const; QString archToString (const quint32 &index) const;

5
src/encoder_nvenc.cpp
View File

@ -198,6 +198,11 @@ public:
<< QString("%1/toolset/%2/avutil-55.dll" ).arg(sysinfo->getAppPath(), arch) << QString("%1/toolset/%2/avutil-55.dll" ).arg(sysinfo->getAppPath(), arch)
<< QString("%1/toolset/%2/swresample-2.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; static const NVEncEncoderInfo s_nvencEncoderInfo;

5
src/encoder_x264.cpp
View File

@ -179,6 +179,11 @@ public:
} }
return QString("%1/toolset/%2/x264_%3_%2.exe").arg(sysinfo->getAppPath(), arch, variant); 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; static const X264EncoderInfo s_x264EncoderInfo;

5
src/encoder_x265.cpp
View File

@ -175,6 +175,11 @@ public:
} }
return QString("%1/toolset/%2/x265_%3_%2.exe").arg(sysinfo->getAppPath(), arch, variant); 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; static const X265EncoderInfo s_x265EncoderInfo;

3
src/win_help.cpp
View File

@ -138,7 +138,8 @@ void HelpDialog::finished(void)
m_startAgain = false; m_startAgain = false;
if(!m_avs2yuv) 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"); ui->plainTextEdit->appendPlainText("\n--------\n");
if(!m_process->waitForStarted()) if(!m_process->waitForStarted())