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

More VapourSynth path fixes: We now store the VapourSynth path *including* the "core" or "core32" postfix.

Browse Source
This commit is contained in:
LoRd_MuldeR 2013-11-29 20:27:45 +01:00
parent 21b57e4a42
commit ddfedba2dd
4 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/thread_encode.cpp
View File

@ -119,7 +119,7 @@ while(0)
#define AVS2_BINARY(BIN_DIR, IS_X64) (QString("%1/%2/avs2yuv_%2.exe").arg((BIN_DIR), ((IS_X64) ? "x64" : "x86"))) #define AVS2_BINARY(BIN_DIR, IS_X64) (QString("%1/%2/avs2yuv_%2.exe").arg((BIN_DIR), ((IS_X64) ? "x64" : "x86")))
#define X264_BINARY(BIN_DIR, IS_10BIT, IS_X64) (QString("%1/%2/x264_%3_%2.exe").arg((BIN_DIR), ((IS_X64) ? "x64" : "x86"), ((IS_10BIT) ? "10bit" : "8bit"))) #define X264_BINARY(BIN_DIR, IS_10BIT, IS_X64) (QString("%1/%2/x264_%3_%2.exe").arg((BIN_DIR), ((IS_X64) ? "x64" : "x86"), ((IS_10BIT) ? "10bit" : "8bit")))
#define VPSP_BINARY(VPS_DIR) (QString("%1/core/vspipe.exe").arg((VPS_DIR))) #define VPSP_BINARY(VPS_DIR) (QString("%1/vspipe.exe").arg((VPS_DIR)))
/* /*
* Static vars * Static vars
@ -240,7 +240,7 @@ void EncodeThread::encode(void)
if(!m_vpsDir.isEmpty()) if(!m_vpsDir.isEmpty())
{ {
log(tr("\nVapourSynth: %1").arg(m_vpsDir)); log(tr("\nVapourSynth: %1").arg(QDir::toNativeSeparators(m_vpsDir)));
} }
//Print encoder settings //Print encoder settings
@ -584,12 +584,12 @@ bool EncodeThread::runEncodingPass(bool x264_x64, bool x264_10bit, bool avs2yuv_
{ {
const int exitCode = processInput.exitCode(); const int exitCode = processInput.exitCode();
log(tr("\nWARNING: Input process exited with error (code: %1), your encode might be *incomplete* !!!").arg(QString::number(exitCode))); log(tr("\nWARNING: Input process exited with error (code: %1), your encode might be *incomplete* !!!").arg(QString::number(exitCode)));
if((inputType == INPUT_AVISYN) && ((exitCode < 0) || (exitCode > 2))) if((inputType == INPUT_AVISYN) && ((exitCode < 0) || (exitCode >= 32)))
{ {
log(tr("\nIMPORTANT: The Avs2YUV process terminated abnormally. This means Avisynth or one of your Avisynth-Plugin's just crashed.")); log(tr("\nIMPORTANT: The Avs2YUV process terminated abnormally. This means Avisynth or one of your Avisynth-Plugin's just crashed."));
log(tr("IMPORTANT: Please fix your Avisynth script and try again! If you use Avisynth-MT, try using a *stable* Avisynth instead!")); log(tr("IMPORTANT: Please fix your Avisynth script and try again! If you use Avisynth-MT, try using a *stable* Avisynth instead!"));
} }
if((inputType == INPUT_VAPOUR) && ((exitCode < 0) || (exitCode > 1))) if((inputType == INPUT_VAPOUR) && ((exitCode < 0) || (exitCode >= 32)))
{ {
log(tr("\nIMPORTANT: The Vapoursynth process terminated abnormally. This means Vapoursynth or one of your Vapoursynth-Plugin's just crashed.")); log(tr("\nIMPORTANT: The Vapoursynth process terminated abnormally. This means Vapoursynth or one of your Vapoursynth-Plugin's just crashed."));
} }
@ -1149,7 +1149,7 @@ bool EncodeThread::checkPropertiesAvisynth(bool x64, unsigned int &frames)
{ {
const int exitCode = process.exitCode(); const int exitCode = process.exitCode();
log(tr("\nPROCESS EXITED WITH ERROR CODE: %1").arg(QString::number(exitCode))); log(tr("\nPROCESS EXITED WITH ERROR CODE: %1").arg(QString::number(exitCode)));
if((exitCode < 0) || (exitCode > 2)) if((exitCode < 0) || (exitCode >= 32))
{ {
log(tr("\nIMPORTANT: The Avs2YUV process terminated abnormally. This means Avisynth or one of your Avisynth-Plugin's just crashed.")); log(tr("\nIMPORTANT: The Avs2YUV process terminated abnormally. This means Avisynth or one of your Avisynth-Plugin's just crashed."));
log(tr("IMPORTANT: Please fix your Avisynth script and try again! If you use Avisynth-MT, try using a *stable* Avisynth instead!")); log(tr("IMPORTANT: Please fix your Avisynth script and try again! If you use Avisynth-MT, try using a *stable* Avisynth instead!"));
@ -1297,7 +1297,7 @@ bool EncodeThread::checkPropertiesVapoursynth(/*const QString &vspipePath,*/ uns
{ {
const int exitCode = process.exitCode(); const int exitCode = process.exitCode();
log(tr("\nPROCESS EXITED WITH ERROR CODE: %1").arg(QString::number(exitCode))); log(tr("\nPROCESS EXITED WITH ERROR CODE: %1").arg(QString::number(exitCode)));
if((exitCode < 0) || (exitCode > 1)) if((exitCode < 0) || (exitCode >= 32))
{ {
log(tr("\nIMPORTANT: The Vapoursynth process terminated abnormally. This means Vapoursynth or one of your Vapoursynth-Plugin's just crashed.")); log(tr("\nIMPORTANT: The Vapoursynth process terminated abnormally. This means Vapoursynth or one of your Vapoursynth-Plugin's just crashed."));
} }

5
src/thread_vapoursynth.cpp
View File

@ -241,7 +241,10 @@ bool VapourSynthCheckThread::detectVapourSynthPath3(QString &path)
m_vpsDllPath = new QFile(vpsDllInfo.canonicalFilePath()); m_vpsDllPath = new QFile(vpsDllInfo.canonicalFilePath());
if(m_vpsExePath->open(QIODevice::ReadOnly) && m_vpsDllPath->open(QIODevice::ReadOnly)) if(m_vpsExePath->open(QIODevice::ReadOnly) && m_vpsDllPath->open(QIODevice::ReadOnly))
{ {
vapoursynthComplete = x264_is_executable(m_vpsExePath->fileName()); if(vapoursynthComplete = x264_is_executable(m_vpsExePath->fileName()))
{
vapoursynthPath.append("/").append(CORE_PATH[i]);
}
break; break;
} }
X264_DELETE(m_vpsExePath); X264_DELETE(m_vpsExePath);

2
src/version.h
View File

@ -26,7 +26,7 @@
#define VER_X264_MAJOR 2 #define VER_X264_MAJOR 2
#define VER_X264_MINOR 2 #define VER_X264_MINOR 2
#define VER_X264_PATCH 7 #define VER_X264_PATCH 7
#define VER_X264_BUILD 671 #define VER_X264_BUILD 673
#define VER_X264_MINIMUM_REV 2363 #define VER_X264_MINIMUM_REV 2363
#define VER_X264_CURRENT_API 140 #define VER_X264_CURRENT_API 140

2
src/win_main.cpp
View File

@ -913,7 +913,7 @@ void MainWindow::init(void)
m_initialized = true; m_initialized = true;
//FIXME //FIXME
QTimer::singleShot(1000, this, SLOT(checkUpdates())); QTimer::singleShot(333, this, SLOT(checkUpdates()));
} }
/* /*