Bump expected QAAC version.

This commit is contained in:
LoRd_MuldeR 2017-12-15 21:04:28 +01:00
parent 54909d5eaa
commit c844801586
2 changed files with 50 additions and 9 deletions

View File

@ -35,7 +35,7 @@
#define VER_LAMEXP_MINOR_LO 6 #define VER_LAMEXP_MINOR_LO 6
#define VER_LAMEXP_TYPE Beta #define VER_LAMEXP_TYPE Beta
#define VER_LAMEXP_PATCH 2 #define VER_LAMEXP_PATCH 2
#define VER_LAMEXP_BUILD 2075 #define VER_LAMEXP_BUILD 2077
#define VER_LAMEXP_CONFG 2002 #define VER_LAMEXP_CONFG 2002
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
@ -52,7 +52,7 @@
#define VER_LAMEXP_TOOL_NEROAAC 1540 #define VER_LAMEXP_TOOL_NEROAAC 1540
#define VER_LAMEXP_TOOL_FHGAACENC 20151024 #define VER_LAMEXP_TOOL_FHGAACENC 20151024
#define VER_LAMEXP_TOOL_FDKAACENC 62 #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) // Helper macros (aka: having fun with the C pre-processor)

View File

@ -132,7 +132,7 @@ g_lamexp_tools[] =
typedef struct typedef struct
{ {
const char *const toolName; const char *const toolName;
const char *const fileNames[8]; const char *const fileNames[5];
const char *const checkArgs; const char *const checkArgs;
const quint32 toolMinVersion; const quint32 toolMinVersion;
const quint32 verDigits; const quint32 verDigits;
@ -140,15 +140,56 @@ typedef struct
const char *const verStr; const char *const verStr;
const char *const regExpVer; const char *const regExpVer;
const char *const regExpSig; const char *const regExpSig;
const char *const regExpLib[3];
} }
aac_encoder_t; aac_encoder_t;
static const aac_encoder_t g_lamexp_aacenc[] = 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 }, "NeroAAC",
{ "FdkAacEnc", { "fdkaac.exe", NULL }, "--help", lamexp_toolver_fdkaacenc(), 3, 10, "v?.?.?", "fdkaac\\s+(\\d)\\.(\\d)\\.(\\d)", NULL }, { "neroAacEnc.exe", "neroAacDec.exe", "neroAacTag.exe", NULL },
{ "QAAC", { "qaac.exe", "libsoxr.dll", "libsoxconvolver.dll", NULL }, "--check", lamexp_toolver_qaacenc(), 2, 100, "v?.??", "qaac (\\d)\\.(\\d+)", NULL }, "-help",
{ "QAACx64", { "qaac64.exe", "libsoxr64.dll", "libsoxconvolver64.dll", NULL }, "--check", lamexp_toolver_qaacenc(), 2, 100, "v?.??", "qaac (\\d)\\.(\\d+)", NULL }, lamexp_toolver_neroaac(), 4, 10, "v?.?.?.?",
{ NULL, { NULL }, NULL, 0, 0, 0, NULL, NULL, NULL } "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 } }
}; };