From c844801586fde035000b38a6730827154d9bc56d Mon Sep 17 00:00:00 2001
From: LoRd_MuldeR <mulder2@gmx.de>
Date: Fri, 15 Dec 2017 21:04:28 +0100
Subject: [PATCH] Bump expected QAAC version.

---
 src/Config.h |  4 ++--
 src/Tools.h  | 55 +++++++++++++++++++++++++++++++++++++++++++++-------
 2 files changed, 50 insertions(+), 9 deletions(-)

diff --git a/src/Config.h b/src/Config.h
index 68077bac..b180a686 100644
--- a/src/Config.h
+++ b/src/Config.h
@@ -35,7 +35,7 @@
 #define VER_LAMEXP_MINOR_LO					6
 #define VER_LAMEXP_TYPE						Beta
 #define VER_LAMEXP_PATCH					2
-#define VER_LAMEXP_BUILD					2075
+#define VER_LAMEXP_BUILD					2077
 #define VER_LAMEXP_CONFG					2002
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -52,7 +52,7 @@
 #define VER_LAMEXP_TOOL_NEROAAC				1540
 #define VER_LAMEXP_TOOL_FHGAACENC			20151024
 #define VER_LAMEXP_TOOL_FDKAACENC			62
-#define VER_LAMEXP_TOOL_QAAC				258
+#define VER_LAMEXP_TOOL_QAAC				264
 
 ///////////////////////////////////////////////////////////////////////////////
 // Helper macros (aka: having fun with the C pre-processor)
diff --git a/src/Tools.h b/src/Tools.h
index d52021cd..2bb4d082 100644
--- a/src/Tools.h
+++ b/src/Tools.h
@@ -132,7 +132,7 @@ g_lamexp_tools[] =
 typedef struct
 {
 	const char *const toolName;
-	const char *const fileNames[8];
+	const char *const fileNames[5];
 	const char *const checkArgs;
 	const quint32     toolMinVersion;
 	const quint32     verDigits;
@@ -140,15 +140,56 @@ typedef struct
 	const char *const verStr;
 	const char *const regExpVer;
 	const char *const regExpSig;
+	const char *const regExpLib[3];
 }
 aac_encoder_t;
 
 static const aac_encoder_t g_lamexp_aacenc[] =
 {
-	{ "NeroAAC",   { "neroAacEnc.exe", "neroAacDec.exe", "neroAacTag.exe",             NULL }, "-help",   lamexp_toolver_neroaac(),   4,  10, "v?.?.?.?",   "Package\\s+version:\\s+(\\d)\\.(\\d)\\.(\\d)\\.(\\d)", "Nero\\s+AAC\\s+Encoder" },
-	{ "FhgAacEnc", { "fhgaacenc.exe",  "enc_fhgaac.dll", "nsutil.dll", "libmp4v2.dll", NULL }, NULL,      lamexp_toolver_fhgaacenc(), 2,   0, "????-??-??", "fhgaacenc version (\\d+) by tmkk. Modified by Case (\\d+).",               NULL },
-	{ "FdkAacEnc", { "fdkaac.exe",                                                     NULL }, "--help",  lamexp_toolver_fdkaacenc(), 3,  10, "v?.?.?",     "fdkaac\\s+(\\d)\\.(\\d)\\.(\\d)",                                          NULL },
-	{ "QAAC",      { "qaac.exe",       "libsoxr.dll",   "libsoxconvolver.dll",         NULL }, "--check", lamexp_toolver_qaacenc(),   2, 100, "v?.??",      "qaac (\\d)\\.(\\d+)",                                                      NULL },
-	{ "QAACx64",   { "qaac64.exe",     "libsoxr64.dll", "libsoxconvolver64.dll",       NULL }, "--check", lamexp_toolver_qaacenc(),   2, 100, "v?.??",      "qaac (\\d)\\.(\\d+)",                                                      NULL },
-	{ NULL, { NULL }, NULL, 0, 0, 0, NULL, NULL, NULL }
+	{ 
+		"NeroAAC",
+		{ "neroAacEnc.exe", "neroAacDec.exe", "neroAacTag.exe", NULL },
+		"-help",
+		lamexp_toolver_neroaac(), 4, 10, "v?.?.?.?",
+		"Package\\s+version:\\s+(\\d)\\.(\\d)\\.(\\d)\\.(\\d)",
+		"Nero\\s+AAC\\s+Encoder",
+		{ NULL }
+	},
+	{
+		"FhgAacEnc",
+		{ "fhgaacenc.exe",  "enc_fhgaac.dll", "nsutil.dll", "libmp4v2.dll", NULL },
+		NULL,
+		lamexp_toolver_fhgaacenc(), 2, 0, "????-??-??",
+		"fhgaacenc version (\\d+) by tmkk. Modified by Case (\\d+).",
+		NULL,
+		{ NULL }
+	},
+	{ 
+		"FdkAacEnc",
+		{ "fdkaac.exe", NULL },
+		"--help",
+		lamexp_toolver_fdkaacenc(), 3, 10, "v?.?.?",
+		"fdkaac\\s+(\\d)\\.(\\d)\\.(\\d)",
+		NULL,
+		{ NULL }
+	},
+	{
+		"QAAC",
+		{ "qaac.exe", "libsoxr.dll", "libsoxconvolver.dll", NULL },
+		"--check",
+		lamexp_toolver_qaacenc(), 2, 100, "v?.??",
+		"qaac (\\d)\\.(\\d+)",
+		NULL,
+		{ "libsoxr-\\d+\\.\\d+\\.\\d+", "libsoxconvolver\\s+\\d+\\.\\d+\\.\\d+" }
+	},
+	{
+		"QAACx64",
+		{ "qaac64.exe", "libsoxr64.dll", "libsoxconvolver64.dll", NULL },
+		"--check",
+		lamexp_toolver_qaacenc(), 2, 100, "v?.??",
+		"qaac (\\d)\\.(\\d+)",
+		NULL,
+		{ "libsoxr-\\d+\\.\\d+\\.\\d+", "libsoxconvolver\\s+\\d+\\.\\d+\\.\\d+" }
+	},
+	{ NULL, { NULL }, NULL, 0, 0, 0, NULL, NULL, NULL, { NULL } }
 };