Some tweaks to VapourSynth detection code, which should fix detection of the "portabl...

diff --git a/README.md b/README.md
index 2fa61ae..64303fa 100644 (file)
--- a/README.md
+++ b/README.md
@@ -116,14 +116,14 @@ InstallPath\
 ├─ x264_launcher_portable.exe
 └─ extra\
    ├─ VapourSynth-32\
-   │  ├─ VapourSynth.dll  <32-Bit>
-   │  ├─ VSPipe.exe       <32-Bit>
-   │  ├─ python37.dll     <32-Bit>
+   │  ├─ VSPipe.exe    <32-Bit>
+   │  ├─ VSScript.dll  <32-Bit>
+   │  ├─ python312.dll <32-Bit>
    │  └─ etc…
    └─ VapourSynth-64\
-      ├─ VapourSynth.dll  <64-Bit>
-      ├─ VSPipe.exe       <64-Bit>
-      ├─ python37.dll     <64-Bit>
+      ├─ VSPipe.exe    <64-Bit>
+      ├─ VSScript.dll  <64-Bit>
+      ├─ python312.dll <64-Bit>
       └─ etc…
 ```
 

diff --git a/src/thread_vapoursynth.cpp b/src/thread_vapoursynth.cpp
index 7dd3f2b..7f01c2c 100644 (file)
--- a/src/thread_vapoursynth.cpp
+++ b/src/thread_vapoursynth.cpp
@@ -46,11 +46,11 @@ QScopedPointer<QFile> VapourSynthCheckThread::m_vpsExePath[2];
 QScopedPointer<QFile> VapourSynthCheckThread::m_vpsDllPath[2];
 
 //Const
-static const char* const VPS_DLL_NAME = "vapoursynth.dll";
-static const char* const VPS_EXE_NAME = "vspipe.exe";
+static const char* const VPS_DLL_NAME = "VSScript.dll";
+static const char* const VPS_EXE_NAME = "VSPipe.exe";
 static const char* const VPS_REG_KEY1 = "SOFTWARE\\VapourSynth";
 static const char* const VPS_REG_KEY2 = "SOFTWARE\\VapourSynth-32";
-static const char* const VPS_REG_NAME = "VapourSynthDLL";
+static const char* const VPS_REG_NAME = "VSPipeEXE";
 
 //Default VapurSynth architecture
 #if _WIN64 || __x86_64__
@@ -226,18 +226,18 @@ int VapourSynthCheckThread::threadMain(void)
                                {
                                        if (MUtils::Registry::reg_key_exists(REG_ROOTS[i], QString::fromLatin1(paths[j]), scopes[k]))
                                        {
-                                               QString vpsRegDllPath;
-                                               if (MUtils::Registry::reg_value_read(REG_ROOTS[i], QString::fromLatin1(paths[j]), QString::fromLatin1(VPS_REG_NAME), vpsRegDllPath, scopes[k]))
+                                               QString vpsRegExePath;
+                                               if (MUtils::Registry::reg_value_read(REG_ROOTS[i], QString::fromLatin1(paths[j]), QString::fromLatin1(VPS_REG_NAME), vpsRegExePath, scopes[k]))
                                                {
-                                                       QFileInfo vpsRegDllInfo(QDir::fromNativeSeparators(vpsRegDllPath));
-                                                       vpsRegDllInfo.makeAbsolute();
-                                                       if (vpsRegDllInfo.exists() && vpsRegDllInfo.isFile())
+                                                       QFileInfo vpsRegExeInfo(QDir::fromNativeSeparators(vpsRegExePath));
+                                                       vpsRegExeInfo.makeAbsolute();
+                                                       if (vpsRegExeInfo.exists() && vpsRegExeInfo.isFile())
                                                        {
                                                                const int vpsArch = (REG_ROOTS[i] == MUtils::Registry::root_machine) ? getVapourSynthType(scopes[k]) : ((j > 0U) ? VAPOURSYNTH_X86 : VAPOURSYNTH_X64);
                                                                if ((!vpsDllInfo.contains(vpsArch)) || (!vpsExeInfo.contains(vpsArch)))
                                                                {
-                                                                       vpsDllInfo.insert(vpsArch, vpsRegDllInfo);
-                                                                       vpsExeInfo.insert(vpsArch, vpsRegDllInfo.absoluteDir().absoluteFilePath(VPS_EXE_NAME)); /*derive VSPipe.EXE path from VapourSynth.DLL path!*/
+                                                                       vpsExeInfo.insert(vpsArch, vpsRegExeInfo);
+                                                                       vpsDllInfo.insert(vpsArch, vpsRegExeInfo.absoluteDir().absoluteFilePath(VPS_DLL_NAME)); /*derive VSScript.dll path from VapourSynth.DLL path!*/
                                                                }
                                                        }
                                                }

diff --git a/src/version.h b/src/version.h
index 7f4118b..c37524e 100644 (file)
--- a/src/version.h
+++ b/src/version.h
@@ -25,9 +25,9 @@
 
 #define VER_X264_MAJOR 3
 #define VER_X264_MINOR 0
-#define VER_X264_PATCH 4
-#define VER_X264_BUILD 1224
+#define VER_X264_PATCH 5
+#define VER_X264_BUILD 1226
 
 #define VER_X264_PORTABLE_EDITION (0)
 
-#define VER_X264_PRE_RELEASE (0)
+#define VER_X264_PRE_RELEASE (1)