Muldersoft/LameXP
Muldersoft/LameXP
1
0
Fork 0
Code Releases 2 Activity

Setup TMP and TEMP environment variables for *all* tools. Also add "$EXEDIR\QTfiles" to the PATH for QAAC.

Browse Source
This commit is contained in:
LoRd_MuldeR 2011-11-22 12:43:32 +01:00
parent 3e7ae9642c
commit 6235115429
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Config.h
View File

@ -30,7 +30,7 @@
#define VER_LAMEXP_MINOR_LO 4 #define VER_LAMEXP_MINOR_LO 4
#define VER_LAMEXP_TYPE Alpha #define VER_LAMEXP_TYPE Alpha
#define VER_LAMEXP_PATCH 2 #define VER_LAMEXP_PATCH 2
#define VER_LAMEXP_BUILD 784 #define VER_LAMEXP_BUILD 785
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
// Tool versions (minimum expected versions!) // Tool versions (minimum expected versions!)

4
src/Encoder_AAC_QAAC.cpp
View File

@ -53,9 +53,7 @@ bool QAACEncoder::encode(const QString &sourceFile, const AudioFileModel &metaIn
process.setWorkingDirectory(QFileInfo(outputFile).canonicalPath()); process.setWorkingDirectory(QFileInfo(outputFile).canonicalPath());
QProcessEnvironment env = QProcessEnvironment::systemEnvironment(); QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
env.insert("PATH", QString("%1;%2").arg(QDir::toNativeSeparators(QDir(QCoreApplication::applicationDirPath()).canonicalPath()), QDir::toNativeSeparators(lamexp_temp_folder2()))); env.insert("PATH", QDir::toNativeSeparators(QString("%1;%1/QTfiles;%2").arg(QDir(QCoreApplication::applicationDirPath()).canonicalPath(), lamexp_temp_folder2())));
env.insert("TEMP", QDir::toNativeSeparators(lamexp_temp_folder2()));
env.insert("TMP", QDir::toNativeSeparators(lamexp_temp_folder2()));
process.setProcessEnvironment(env); process.setProcessEnvironment(env);
if(m_configRCMode != SettingsModel::VBRMode) if(m_configRCMode != SettingsModel::VBRMode)

9
src/Tool_Abstract.cpp
View File

@ -27,6 +27,8 @@
#include <QMutex> #include <QMutex>
#include <QMutexLocker> #include <QMutexLocker>
#include <QLibrary> #include <QLibrary>
#include <QProcessEnvironment>
#include <QDir>
/* /*
* Win32 API definitions * Win32 API definitions
@ -97,9 +99,14 @@ bool AbstractTool::startProcess(QProcess &process, const QString &program, const
static AssignProcessToJobObjectFun AssignProcessToJobObjectPtr = NULL; static AssignProcessToJobObjectFun AssignProcessToJobObjectPtr = NULL;
QMutexLocker lock(m_mutex_startProcess); QMutexLocker lock(m_mutex_startProcess);
emit messageLogged(commandline2string(program, args) + "\n"); emit messageLogged(commandline2string(program, args) + "\n");
QProcessEnvironment env = process.processEnvironment();
if(env.isEmpty()) env = QProcessEnvironment::systemEnvironment();
env.insert("TEMP", QDir::toNativeSeparators(lamexp_temp_folder2()));
env.insert("TMP", QDir::toNativeSeparators(lamexp_temp_folder2()));
process.setProcessEnvironment(env);
if(!AssignProcessToJobObjectPtr) if(!AssignProcessToJobObjectPtr)
{ {
QLibrary Kernel32Lib("kernel32.dll"); QLibrary Kernel32Lib("kernel32.dll");