Implemented multi-threading for file analyzer. Now multiple files can be analyzed in parallel. This should speed-up adding files quite a bit, especially when a huge number of files is added at once.
This commit is contained in:
parent
1da4db9594
commit
14492b9c49
@ -448,6 +448,7 @@ del "$(TargetDir)imageformats\q???d4.dll"
|
|||||||
<ClCompile Include="src\Thread_CueSplitter.cpp" />
|
<ClCompile Include="src\Thread_CueSplitter.cpp" />
|
||||||
<ClCompile Include="src\Thread_DiskObserver.cpp" />
|
<ClCompile Include="src\Thread_DiskObserver.cpp" />
|
||||||
<ClCompile Include="src\Thread_FileAnalyzer.cpp" />
|
<ClCompile Include="src\Thread_FileAnalyzer.cpp" />
|
||||||
|
<ClCompile Include="src\Thread_FileAnalyzer_Task.cpp" />
|
||||||
<ClCompile Include="src\Thread_Initialization.cpp" />
|
<ClCompile Include="src\Thread_Initialization.cpp" />
|
||||||
<ClCompile Include="src\Thread_MessageHandler.cpp" />
|
<ClCompile Include="src\Thread_MessageHandler.cpp" />
|
||||||
<ClCompile Include="src\Thread_MessageProducer.cpp" />
|
<ClCompile Include="src\Thread_MessageProducer.cpp" />
|
||||||
@ -489,6 +490,7 @@ del "$(TargetDir)imageformats\q???d4.dll"
|
|||||||
<ClCompile Include="tmp\MOC_Thread_CueSplitter.cpp" />
|
<ClCompile Include="tmp\MOC_Thread_CueSplitter.cpp" />
|
||||||
<ClCompile Include="tmp\MOC_Thread_DiskObserver.cpp" />
|
<ClCompile Include="tmp\MOC_Thread_DiskObserver.cpp" />
|
||||||
<ClCompile Include="tmp\MOC_Thread_FileAnalyzer.cpp" />
|
<ClCompile Include="tmp\MOC_Thread_FileAnalyzer.cpp" />
|
||||||
|
<ClCompile Include="tmp\MOC_Thread_FileAnalyzer_Task.cpp" />
|
||||||
<ClCompile Include="tmp\MOC_Thread_Initialization.cpp" />
|
<ClCompile Include="tmp\MOC_Thread_Initialization.cpp" />
|
||||||
<ClCompile Include="tmp\MOC_Thread_MessageHandler.cpp" />
|
<ClCompile Include="tmp\MOC_Thread_MessageHandler.cpp" />
|
||||||
<ClCompile Include="tmp\MOC_Thread_MessageProducer.cpp" />
|
<ClCompile Include="tmp\MOC_Thread_MessageProducer.cpp" />
|
||||||
@ -662,6 +664,23 @@ del "$(TargetDir)imageformats\q???d4.dll"
|
|||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release_Static_Qt5|Win32'">$(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs)</Outputs>
|
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release_Static_Qt5|Win32'">$(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs)</Outputs>
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs)</Outputs>
|
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs)</Outputs>
|
||||||
</CustomBuild>
|
</CustomBuild>
|
||||||
|
<CustomBuild Include="src\Thread_FileAnalyzer_Task.h">
|
||||||
|
<Command Condition="'$(Configuration)|$(Platform)'=='Debug_Qt5|Win32'">"$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)"</Command>
|
||||||
|
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)"</Command>
|
||||||
|
<Command Condition="'$(Configuration)|$(Platform)'=='Release_Static_Qt5|Win32'">"$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)"</Command>
|
||||||
|
<Command Condition="'$(Configuration)|$(Platform)'=='Release_Static|Win32'">"$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)"</Command>
|
||||||
|
<Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)"</Command>
|
||||||
|
<Message Condition="'$(Configuration)|$(Platform)'=='Debug_Qt5|Win32'">MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp"</Message>
|
||||||
|
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp"</Message>
|
||||||
|
<Message Condition="'$(Configuration)|$(Platform)'=='Release_Static_Qt5|Win32'">MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp"</Message>
|
||||||
|
<Message Condition="'$(Configuration)|$(Platform)'=='Release_Static|Win32'">MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp"</Message>
|
||||||
|
<Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp"</Message>
|
||||||
|
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug_Qt5|Win32'">$(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs)</Outputs>
|
||||||
|
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs)</Outputs>
|
||||||
|
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release_Static_Qt5|Win32'">$(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs)</Outputs>
|
||||||
|
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release_Static|Win32'">$(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs)</Outputs>
|
||||||
|
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs)</Outputs>
|
||||||
|
</CustomBuild>
|
||||||
<ClInclude Include="src\Tools.h" />
|
<ClInclude Include="src\Tools.h" />
|
||||||
<CustomBuild Include="src\Tool_WaveProperties.h">
|
<CustomBuild Include="src\Tool_WaveProperties.h">
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)"</Command>
|
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)"</Command>
|
||||||
@ -1198,21 +1217,18 @@ del "$(TargetDir)imageformats\q???d4.dll"
|
|||||||
<CustomBuild Include="src\Thread_FileAnalyzer.h">
|
<CustomBuild Include="src\Thread_FileAnalyzer.h">
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp"</Message>
|
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp"</Message>
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='Debug_Qt5|Win32'">MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp"</Message>
|
<Message Condition="'$(Configuration)|$(Platform)'=='Debug_Qt5|Win32'">MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp"</Message>
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)"
|
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)"</Command>
|
||||||
</Command>
|
<Command Condition="'$(Configuration)|$(Platform)'=='Debug_Qt5|Win32'">"$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)"</Command>
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='Debug_Qt5|Win32'">"$(QTDIR5)\qtbase\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)"</Command>
|
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs)</Outputs>
|
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs)</Outputs>
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug_Qt5|Win32'">$(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs)</Outputs>
|
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug_Qt5|Win32'">$(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs)</Outputs>
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='Release_Static|Win32'">MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp"</Message>
|
<Message Condition="'$(Configuration)|$(Platform)'=='Release_Static|Win32'">MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp"</Message>
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='Release_Static_Qt5|Win32'">MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp"</Message>
|
<Message Condition="'$(Configuration)|$(Platform)'=='Release_Static_Qt5|Win32'">MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp"</Message>
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='Release_Static|Win32'">"$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)"
|
<Command Condition="'$(Configuration)|$(Platform)'=='Release_Static|Win32'">"$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)"</Command>
|
||||||
</Command>
|
<Command Condition="'$(Configuration)|$(Platform)'=='Release_Static_Qt5|Win32'">"$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)"</Command>
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='Release_Static_Qt5|Win32'">"$(QTDIR5)\qtbase\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)"</Command>
|
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release_Static|Win32'">$(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs)</Outputs>
|
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release_Static|Win32'">$(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs)</Outputs>
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release_Static_Qt5|Win32'">$(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs)</Outputs>
|
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release_Static_Qt5|Win32'">$(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs)</Outputs>
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp"</Message>
|
<Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp"</Message>
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)"
|
<Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)"</Command>
|
||||||
</Command>
|
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs)</Outputs>
|
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs)</Outputs>
|
||||||
</CustomBuild>
|
</CustomBuild>
|
||||||
<CustomBuild Include="src\Thread_Initialization.h">
|
<CustomBuild Include="src\Thread_Initialization.h">
|
||||||
|
|||||||
@ -352,6 +352,12 @@
|
|||||||
<ClCompile Include="tmp\MOC_Encoder_DCA.cpp">
|
<ClCompile Include="tmp\MOC_Encoder_DCA.cpp">
|
||||||
<Filter>Generated Files\MOC</Filter>
|
<Filter>Generated Files\MOC</Filter>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
|
<ClCompile Include="src\Thread_FileAnalyzer_Task.cpp">
|
||||||
|
<Filter>Source Files\Threads</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
<ClCompile Include="tmp\MOC_Thread_FileAnalyzer_Task.cpp">
|
||||||
|
<Filter>Generated Files\MOC</Filter>
|
||||||
|
</ClCompile>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ClInclude Include="src\Config.h">
|
<ClInclude Include="src\Config.h">
|
||||||
@ -653,6 +659,9 @@
|
|||||||
<CustomBuild Include="src\Encoder_DCA.h">
|
<CustomBuild Include="src\Encoder_DCA.h">
|
||||||
<Filter>Header Files\Encoders</Filter>
|
<Filter>Header Files\Encoders</Filter>
|
||||||
</CustomBuild>
|
</CustomBuild>
|
||||||
|
<CustomBuild Include="src\Thread_FileAnalyzer_Task.h">
|
||||||
|
<Filter>Header Files\Threads</Filter>
|
||||||
|
</CustomBuild>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<None Include="res\MainIcon.ico" />
|
<None Include="res\MainIcon.ico" />
|
||||||
|
|||||||
@ -18,6 +18,8 @@ a:visited { color: #0000EE; }
|
|||||||
|
|
||||||
<a name="4.05"></a>Changes between v4.04 and v4.05 [<font color="darkred">unreleased</font>]:<br><ul>
|
<a name="4.05"></a>Changes between v4.04 and v4.05 [<font color="darkred">unreleased</font>]:<br><ul>
|
||||||
<li>Added Swedish translation, thanks to Åke Engelbrektson <eson57@gmail.com>
|
<li>Added Swedish translation, thanks to Åke Engelbrektson <eson57@gmail.com>
|
||||||
|
<li>Implemented multi-threading in initialization code for faster application startup
|
||||||
|
<li>Implemented multi-threading in file analyzer for faster file import
|
||||||
</ul><br>
|
</ul><br>
|
||||||
|
|
||||||
<a name="4.04"></a>Changes between v4.03 and v4.04 [2012-04-26]:<br><ul>
|
<a name="4.04"></a>Changes between v4.03 and v4.04 [2012-04-26]:<br><ul>
|
||||||
|
|||||||
@ -30,7 +30,7 @@
|
|||||||
#define VER_LAMEXP_MINOR_LO 5
|
#define VER_LAMEXP_MINOR_LO 5
|
||||||
#define VER_LAMEXP_TYPE Alpha
|
#define VER_LAMEXP_TYPE Alpha
|
||||||
#define VER_LAMEXP_PATCH 1
|
#define VER_LAMEXP_PATCH 1
|
||||||
#define VER_LAMEXP_BUILD 994
|
#define VER_LAMEXP_BUILD 998
|
||||||
|
|
||||||
///////////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////////
|
||||||
// Tool versions (minimum expected versions!)
|
// Tool versions (minimum expected versions!)
|
||||||
|
|||||||
@ -24,7 +24,7 @@
|
|||||||
#include "Global.h"
|
#include "Global.h"
|
||||||
#include "LockedFile.h"
|
#include "LockedFile.h"
|
||||||
#include "Model_AudioFile.h"
|
#include "Model_AudioFile.h"
|
||||||
#include "PlaylistImporter.h"
|
#include "Thread_FileAnalyzer_Task.h"
|
||||||
|
|
||||||
#include <QDir>
|
#include <QDir>
|
||||||
#include <QFileInfo>
|
#include <QFileInfo>
|
||||||
@ -33,12 +33,7 @@
|
|||||||
#include <QTime>
|
#include <QTime>
|
||||||
#include <QDebug>
|
#include <QDebug>
|
||||||
#include <QImage>
|
#include <QImage>
|
||||||
|
#include <QThreadPool>
|
||||||
#include <math.h>
|
|
||||||
|
|
||||||
#define IS_KEY(KEY) (key.compare(KEY, Qt::CaseInsensitive) == 0)
|
|
||||||
#define IS_SEC(SEC) (key.startsWith((SEC "_"), Qt::CaseInsensitive))
|
|
||||||
#define FIRST_TOK(STR) (STR.split(" ", QString::SkipEmptyParts).first())
|
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////
|
||||||
// Constructor
|
// Constructor
|
||||||
@ -46,25 +41,12 @@
|
|||||||
|
|
||||||
FileAnalyzer::FileAnalyzer(const QStringList &inputFiles)
|
FileAnalyzer::FileAnalyzer(const QStringList &inputFiles)
|
||||||
:
|
:
|
||||||
|
m_abortFlag(false),
|
||||||
m_inputFiles(inputFiles),
|
m_inputFiles(inputFiles),
|
||||||
m_mediaInfoBin(lamexp_lookup_tool("mediainfo.exe")),
|
m_templateFile(NULL)
|
||||||
m_avs2wavBin(lamexp_lookup_tool("avs2wav.exe")),
|
|
||||||
m_templateFile(NULL),
|
|
||||||
m_abortFlag(false)
|
|
||||||
{
|
{
|
||||||
m_bSuccess = false;
|
m_bSuccess = false;
|
||||||
m_bAborted = false;
|
m_bAborted = false;
|
||||||
|
|
||||||
if(m_mediaInfoBin.isEmpty())
|
|
||||||
{
|
|
||||||
qFatal("Invalid path to MediaInfo binary. Tool not initialized properly.");
|
|
||||||
}
|
|
||||||
|
|
||||||
m_filesAccepted = 0;
|
|
||||||
m_filesRejected = 0;
|
|
||||||
m_filesDenied = 0;
|
|
||||||
m_filesDummyCDDA = 0;
|
|
||||||
m_filesCueSheet = 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
FileAnalyzer::~FileAnalyzer(void)
|
FileAnalyzer::~FileAnalyzer(void)
|
||||||
@ -75,6 +57,8 @@ FileAnalyzer::~FileAnalyzer(void)
|
|||||||
LAMEXP_DELETE(m_templateFile);
|
LAMEXP_DELETE(m_templateFile);
|
||||||
if(QFile::exists(templatePath)) QFile::remove(templatePath);
|
if(QFile::exists(templatePath)) QFile::remove(templatePath);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
AnalyzeTask::reset();
|
||||||
}
|
}
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////
|
||||||
@ -126,14 +110,7 @@ void FileAnalyzer::run()
|
|||||||
m_bSuccess = false;
|
m_bSuccess = false;
|
||||||
m_bAborted = false;
|
m_bAborted = false;
|
||||||
|
|
||||||
m_filesAccepted = 0;
|
|
||||||
m_filesRejected = 0;
|
|
||||||
m_filesDenied = 0;
|
|
||||||
m_filesDummyCDDA = 0;
|
|
||||||
m_filesCueSheet = 0;
|
|
||||||
|
|
||||||
m_inputFiles.sort();
|
m_inputFiles.sort();
|
||||||
m_recentlyAdded.clear();
|
|
||||||
m_abortFlag = false;
|
m_abortFlag = false;
|
||||||
|
|
||||||
if(!m_templateFile)
|
if(!m_templateFile)
|
||||||
@ -145,76 +122,55 @@ void FileAnalyzer::run()
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
while(!m_inputFiles.isEmpty())
|
AnalyzeTask::reset();
|
||||||
|
QThreadPool *pool = new QThreadPool();
|
||||||
|
|
||||||
|
while(!(m_inputFiles.isEmpty() || m_bAborted))
|
||||||
{
|
{
|
||||||
int fileType = fileTypeNormal;
|
while(!(m_inputFiles.isEmpty() || m_bAborted))
|
||||||
QString currentFile = QDir::fromNativeSeparators(m_inputFiles.takeFirst());
|
{
|
||||||
qDebug("Analyzing: %s", currentFile.toUtf8().constData());
|
const QString currentFile = QDir::fromNativeSeparators(m_inputFiles.takeFirst());
|
||||||
emit fileSelected(QFileInfo(currentFile).fileName());
|
|
||||||
AudioFileModel file = analyzeFile(currentFile, &fileType);
|
if(m_inputFiles.isEmpty())
|
||||||
|
{
|
||||||
|
pool->waitForDone();
|
||||||
|
}
|
||||||
|
|
||||||
|
AnalyzeTask *task = new AnalyzeTask(currentFile, m_templateFile->filePath(), &m_abortFlag);
|
||||||
|
connect(task, SIGNAL(fileSelected(QString)), this, SIGNAL(fileSelected(QString)), Qt::DirectConnection);
|
||||||
|
connect(task, SIGNAL(fileAnalyzed(AudioFileModel)), this, SIGNAL(fileAnalyzed(AudioFileModel)), Qt::DirectConnection);
|
||||||
|
|
||||||
|
while(!pool->tryStart(task))
|
||||||
|
{
|
||||||
|
QThread::msleep(125); //No more free threads, wait for active threads!
|
||||||
|
if(m_abortFlag) { LAMEXP_DELETE(task); break; }
|
||||||
|
}
|
||||||
|
|
||||||
if(m_abortFlag)
|
if(m_abortFlag)
|
||||||
{
|
{
|
||||||
MessageBeep(MB_ICONERROR);
|
MessageBeep(MB_ICONERROR);
|
||||||
m_bAborted = true;
|
m_bAborted = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
QThread::yieldCurrentThread();
|
||||||
|
}
|
||||||
|
|
||||||
|
if(!m_bAborted)
|
||||||
|
{
|
||||||
|
pool->waitForDone();
|
||||||
|
AnalyzeTask::getAdditionalFiles(m_inputFiles);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pool->waitForDone();
|
||||||
|
LAMEXP_DELETE(pool);
|
||||||
|
|
||||||
|
|
||||||
|
if(m_bAborted)
|
||||||
|
{
|
||||||
qWarning("Operation cancelled by user!");
|
qWarning("Operation cancelled by user!");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if(fileType == fileTypeSkip)
|
|
||||||
{
|
|
||||||
qWarning("File was recently added, skipping!");
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
if(fileType == fileTypeDenied)
|
|
||||||
{
|
|
||||||
m_filesDenied++;
|
|
||||||
qWarning("Cannot access file for reading, skipping!");
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
if(fileType == fileTypeCDDA)
|
|
||||||
{
|
|
||||||
m_filesDummyCDDA++;
|
|
||||||
qWarning("Dummy CDDA file detected, skipping!");
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
if(file.fileName().isEmpty() || file.formatContainerType().isEmpty() || file.formatAudioType().isEmpty())
|
|
||||||
{
|
|
||||||
if(PlaylistImporter::importPlaylist(m_inputFiles, currentFile))
|
|
||||||
{
|
|
||||||
qDebug("Imported playlist file.");
|
|
||||||
}
|
|
||||||
else if(!QFileInfo(currentFile).suffix().compare("cue", Qt::CaseInsensitive))
|
|
||||||
{
|
|
||||||
qWarning("Cue Sheet file detected, skipping!");
|
|
||||||
m_filesCueSheet++;
|
|
||||||
}
|
|
||||||
else if(!QFileInfo(currentFile).suffix().compare("avs", Qt::CaseInsensitive))
|
|
||||||
{
|
|
||||||
qDebug("Found a potential Avisynth script, investigating...");
|
|
||||||
if(analyzeAvisynthFile(currentFile, file))
|
|
||||||
{
|
|
||||||
m_filesAccepted++;
|
|
||||||
emit fileAnalyzed(file);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
qDebug("Rejected Avisynth file: %s", file.filePath().toUtf8().constData());
|
|
||||||
m_filesRejected++;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
qDebug("Rejected file of unknown type: %s", file.filePath().toUtf8().constData());
|
|
||||||
m_filesRejected++;
|
|
||||||
}
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
m_filesAccepted++;
|
|
||||||
m_recentlyAdded.append(file.filePath());
|
|
||||||
emit fileAnalyzed(file);
|
|
||||||
}
|
|
||||||
|
|
||||||
qDebug("All files added.\n");
|
qDebug("All files added.\n");
|
||||||
m_bSuccess = true;
|
m_bSuccess = true;
|
||||||
@ -224,479 +180,6 @@ void FileAnalyzer::run()
|
|||||||
// Privtae Functions
|
// Privtae Functions
|
||||||
////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
const AudioFileModel FileAnalyzer::analyzeFile(const QString &filePath, int *type)
|
|
||||||
{
|
|
||||||
*type = fileTypeNormal;
|
|
||||||
|
|
||||||
AudioFileModel audioFile(filePath);
|
|
||||||
|
|
||||||
if(m_recentlyAdded.contains(filePath, Qt::CaseInsensitive))
|
|
||||||
{
|
|
||||||
*type = fileTypeSkip;
|
|
||||||
return audioFile;
|
|
||||||
}
|
|
||||||
|
|
||||||
QFile readTest(filePath);
|
|
||||||
if(!readTest.open(QIODevice::ReadOnly))
|
|
||||||
{
|
|
||||||
*type = fileTypeDenied;
|
|
||||||
return audioFile;
|
|
||||||
}
|
|
||||||
if(checkFile_CDDA(readTest))
|
|
||||||
{
|
|
||||||
*type = fileTypeCDDA;
|
|
||||||
return audioFile;
|
|
||||||
}
|
|
||||||
readTest.close();
|
|
||||||
|
|
||||||
bool skipNext = false;
|
|
||||||
unsigned int id_val[2] = {UINT_MAX, UINT_MAX};
|
|
||||||
cover_t coverType = coverNone;
|
|
||||||
QByteArray coverData;
|
|
||||||
|
|
||||||
QStringList params;
|
|
||||||
params << QString("--Inform=file://%1").arg(QDir::toNativeSeparators(m_templateFile->filePath()));
|
|
||||||
params << QDir::toNativeSeparators(filePath);
|
|
||||||
|
|
||||||
QProcess process;
|
|
||||||
process.setProcessChannelMode(QProcess::MergedChannels);
|
|
||||||
process.setReadChannel(QProcess::StandardOutput);
|
|
||||||
process.start(m_mediaInfoBin, params);
|
|
||||||
|
|
||||||
if(!process.waitForStarted())
|
|
||||||
{
|
|
||||||
qWarning("MediaInfo process failed to create!");
|
|
||||||
qWarning("Error message: \"%s\"\n", process.errorString().toLatin1().constData());
|
|
||||||
process.kill();
|
|
||||||
process.waitForFinished(-1);
|
|
||||||
return audioFile;
|
|
||||||
}
|
|
||||||
|
|
||||||
while(process.state() != QProcess::NotRunning)
|
|
||||||
{
|
|
||||||
if(m_abortFlag)
|
|
||||||
{
|
|
||||||
process.kill();
|
|
||||||
qWarning("Process was aborted on user request!");
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
if(!process.waitForReadyRead())
|
|
||||||
{
|
|
||||||
if(process.state() == QProcess::Running)
|
|
||||||
{
|
|
||||||
qWarning("MediaInfo time out. Killing process and skipping file!");
|
|
||||||
process.kill();
|
|
||||||
process.waitForFinished(-1);
|
|
||||||
return audioFile;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
QByteArray data;
|
|
||||||
|
|
||||||
while(process.canReadLine())
|
|
||||||
{
|
|
||||||
QString line = QString::fromUtf8(process.readLine().constData()).simplified();
|
|
||||||
if(!line.isEmpty())
|
|
||||||
{
|
|
||||||
//qDebug("Line:%s", line.toUtf8().constData());
|
|
||||||
|
|
||||||
int index = line.indexOf('=');
|
|
||||||
if(index > 0)
|
|
||||||
{
|
|
||||||
QString key = line.left(index).trimmed();
|
|
||||||
QString val = line.mid(index+1).trimmed();
|
|
||||||
if(!key.isEmpty())
|
|
||||||
{
|
|
||||||
updateInfo(audioFile, &skipNext, id_val, &coverType, &coverData, key, val);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if(audioFile.fileName().isEmpty())
|
|
||||||
{
|
|
||||||
QString baseName = QFileInfo(filePath).fileName();
|
|
||||||
int index = baseName.lastIndexOf(".");
|
|
||||||
|
|
||||||
if(index >= 0)
|
|
||||||
{
|
|
||||||
baseName = baseName.left(index);
|
|
||||||
}
|
|
||||||
|
|
||||||
baseName = baseName.replace("_", " ").simplified();
|
|
||||||
index = baseName.lastIndexOf(" - ");
|
|
||||||
|
|
||||||
if(index >= 0)
|
|
||||||
{
|
|
||||||
baseName = baseName.mid(index + 3).trimmed();
|
|
||||||
}
|
|
||||||
|
|
||||||
audioFile.setFileName(baseName);
|
|
||||||
}
|
|
||||||
|
|
||||||
process.waitForFinished();
|
|
||||||
if(process.state() != QProcess::NotRunning)
|
|
||||||
{
|
|
||||||
process.kill();
|
|
||||||
process.waitForFinished(-1);
|
|
||||||
}
|
|
||||||
|
|
||||||
if((coverType != coverNone) && (!coverData.isEmpty()))
|
|
||||||
{
|
|
||||||
retrieveCover(audioFile, coverType, coverData);
|
|
||||||
}
|
|
||||||
|
|
||||||
return audioFile;
|
|
||||||
}
|
|
||||||
|
|
||||||
void FileAnalyzer::updateInfo(AudioFileModel &audioFile, bool *skipNext, unsigned int *id_val, cover_t *coverType, QByteArray *coverData, const QString &key, const QString &value)
|
|
||||||
{
|
|
||||||
//qWarning("'%s' -> '%s'", key.toUtf8().constData(), value.toUtf8().constData());
|
|
||||||
|
|
||||||
/*New Stream*/
|
|
||||||
if(IS_KEY("Gen_ID") || IS_KEY("Aud_ID"))
|
|
||||||
{
|
|
||||||
if(value.isEmpty())
|
|
||||||
{
|
|
||||||
*skipNext = false;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
//We ignore all ID's, except for the lowest one!
|
|
||||||
bool ok = false;
|
|
||||||
unsigned int id = value.toUInt(&ok);
|
|
||||||
if(ok)
|
|
||||||
{
|
|
||||||
if(IS_KEY("Gen_ID")) { id_val[0] = qMin(id_val[0], id); *skipNext = (id > id_val[0]); }
|
|
||||||
if(IS_KEY("Aud_ID")) { id_val[1] = qMin(id_val[1], id); *skipNext = (id > id_val[1]); }
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
*skipNext = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if(*skipNext)
|
|
||||||
{
|
|
||||||
qWarning("Skipping info for non-primary stream!");
|
|
||||||
}
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*Skip or empty?*/
|
|
||||||
if((*skipNext) || value.isEmpty())
|
|
||||||
{
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*Playlist file?*/
|
|
||||||
if(IS_KEY("Aud_Source"))
|
|
||||||
{
|
|
||||||
*skipNext = true;
|
|
||||||
audioFile.setFormatContainerType(QString());
|
|
||||||
audioFile.setFormatAudioType(QString());
|
|
||||||
qWarning("Skipping info for playlist file!");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*General Section*/
|
|
||||||
if(IS_SEC("Gen"))
|
|
||||||
{
|
|
||||||
if(IS_KEY("Gen_Format"))
|
|
||||||
{
|
|
||||||
audioFile.setFormatContainerType(value);
|
|
||||||
}
|
|
||||||
else if(IS_KEY("Gen_Format_Profile"))
|
|
||||||
{
|
|
||||||
audioFile.setFormatContainerProfile(value);
|
|
||||||
}
|
|
||||||
else if(IS_KEY("Gen_Title") || IS_KEY("Gen_Track"))
|
|
||||||
{
|
|
||||||
audioFile.setFileName(value);
|
|
||||||
}
|
|
||||||
else if(IS_KEY("Gen_Duration"))
|
|
||||||
{
|
|
||||||
unsigned int tmp = parseDuration(value);
|
|
||||||
if(tmp > 0) audioFile.setFileDuration(tmp);
|
|
||||||
}
|
|
||||||
else if(IS_KEY("Gen_Artist") || IS_KEY("Gen_Performer"))
|
|
||||||
{
|
|
||||||
audioFile.setFileArtist(value);
|
|
||||||
}
|
|
||||||
else if(IS_KEY("Gen_Album"))
|
|
||||||
{
|
|
||||||
audioFile.setFileAlbum(value);
|
|
||||||
}
|
|
||||||
else if(IS_KEY("Gen_Genre"))
|
|
||||||
{
|
|
||||||
audioFile.setFileGenre(value);
|
|
||||||
}
|
|
||||||
else if(IS_KEY("Gen_Released_Date") || IS_KEY("Gen_Recorded_Date"))
|
|
||||||
{
|
|
||||||
unsigned int tmp = parseYear(value);
|
|
||||||
if(tmp > 0) audioFile.setFileYear(tmp);
|
|
||||||
}
|
|
||||||
else if(IS_KEY("Gen_Comment"))
|
|
||||||
{
|
|
||||||
audioFile.setFileComment(value);
|
|
||||||
}
|
|
||||||
else if(IS_KEY("Gen_Track/Position"))
|
|
||||||
{
|
|
||||||
bool ok = false;
|
|
||||||
unsigned int tmp = value.toUInt(&ok);
|
|
||||||
if(ok) audioFile.setFilePosition(tmp);
|
|
||||||
}
|
|
||||||
else if(IS_KEY("Gen_Cover") || IS_KEY("Gen_Cover_Type"))
|
|
||||||
{
|
|
||||||
if(*coverType == coverNone)
|
|
||||||
{
|
|
||||||
*coverType = coverJpeg;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else if(IS_KEY("Gen_Cover_Mime"))
|
|
||||||
{
|
|
||||||
QString temp = FIRST_TOK(value);
|
|
||||||
if(!temp.compare("image/jpeg", Qt::CaseInsensitive)) *coverType = coverJpeg;
|
|
||||||
else if(!temp.compare("image/png", Qt::CaseInsensitive)) *coverType = coverPng;
|
|
||||||
else if(!temp.compare("image/gif", Qt::CaseInsensitive)) *coverType = coverGif;
|
|
||||||
}
|
|
||||||
else if(IS_KEY("Gen_Cover_Data"))
|
|
||||||
{
|
|
||||||
if(!coverData->isEmpty()) coverData->clear();
|
|
||||||
coverData->append(QByteArray::fromBase64(FIRST_TOK(value).toLatin1()));
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
qWarning("Unknown key '%s' with value '%s' found!", key.toUtf8().constData(), value.toUtf8().constData());
|
|
||||||
}
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*Audio Section*/
|
|
||||||
if(IS_SEC("Aud"))
|
|
||||||
{
|
|
||||||
|
|
||||||
if(IS_KEY("Aud_Format"))
|
|
||||||
{
|
|
||||||
audioFile.setFormatAudioType(value);
|
|
||||||
}
|
|
||||||
else if(IS_KEY("Aud_Format_Profile"))
|
|
||||||
{
|
|
||||||
audioFile.setFormatAudioProfile(value);
|
|
||||||
}
|
|
||||||
else if(IS_KEY("Aud_Format_Version"))
|
|
||||||
{
|
|
||||||
audioFile.setFormatAudioVersion(value);
|
|
||||||
}
|
|
||||||
else if(IS_KEY("Aud_Channel(s)"))
|
|
||||||
{
|
|
||||||
bool ok = false;
|
|
||||||
unsigned int tmp = value.toUInt(&ok);
|
|
||||||
if(ok) audioFile.setFormatAudioChannels(tmp);
|
|
||||||
}
|
|
||||||
else if(IS_KEY("Aud_SamplingRate"))
|
|
||||||
{
|
|
||||||
bool ok = false;
|
|
||||||
unsigned int tmp = value.toUInt(&ok);
|
|
||||||
if(ok) audioFile.setFormatAudioSamplerate(tmp);
|
|
||||||
}
|
|
||||||
else if(IS_KEY("Aud_BitDepth"))
|
|
||||||
{
|
|
||||||
bool ok = false;
|
|
||||||
unsigned int tmp = value.toUInt(&ok);
|
|
||||||
if(ok) audioFile.setFormatAudioBitdepth(tmp);
|
|
||||||
}
|
|
||||||
else if(IS_KEY("Aud_Duration"))
|
|
||||||
{
|
|
||||||
unsigned int tmp = parseDuration(value);
|
|
||||||
if(tmp > 0) audioFile.setFileDuration(tmp);
|
|
||||||
}
|
|
||||||
else if(IS_KEY("Aud_BitRate"))
|
|
||||||
{
|
|
||||||
bool ok = false;
|
|
||||||
unsigned int tmp = value.toUInt(&ok);
|
|
||||||
if(ok) audioFile.setFormatAudioBitrate(tmp/1000);
|
|
||||||
}
|
|
||||||
else if(IS_KEY("Aud_BitRate_Mode"))
|
|
||||||
{
|
|
||||||
if(!value.compare("CBR", Qt::CaseInsensitive)) audioFile.setFormatAudioBitrateMode(AudioFileModel::BitrateModeConstant);
|
|
||||||
if(!value.compare("VBR", Qt::CaseInsensitive)) audioFile.setFormatAudioBitrateMode(AudioFileModel::BitrateModeVariable);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
qWarning("Unknown key '%s' with value '%s' found!", key.toUtf8().constData(), value.toUtf8().constData());
|
|
||||||
}
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*Section not recognized*/
|
|
||||||
qWarning("Unknown section: %s", key.toUtf8().constData());
|
|
||||||
}
|
|
||||||
|
|
||||||
bool FileAnalyzer::checkFile_CDDA(QFile &file)
|
|
||||||
{
|
|
||||||
file.reset();
|
|
||||||
QByteArray data = file.read(128);
|
|
||||||
|
|
||||||
int i = data.indexOf("RIFF");
|
|
||||||
int j = data.indexOf("CDDA");
|
|
||||||
int k = data.indexOf("fmt ");
|
|
||||||
|
|
||||||
return ((i >= 0) && (j >= 0) && (k >= 0) && (k > j) && (j > i));
|
|
||||||
}
|
|
||||||
|
|
||||||
void FileAnalyzer::retrieveCover(AudioFileModel &audioFile, cover_t coverType, const QByteArray &coverData)
|
|
||||||
{
|
|
||||||
qDebug("Retrieving cover!");
|
|
||||||
QString extension;
|
|
||||||
|
|
||||||
switch(coverType)
|
|
||||||
{
|
|
||||||
case coverPng:
|
|
||||||
extension = QString::fromLatin1("png");
|
|
||||||
break;
|
|
||||||
case coverGif:
|
|
||||||
extension = QString::fromLatin1("gif");
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
extension = QString::fromLatin1("jpg");
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
if(!(QImage::fromData(coverData, extension.toUpper().toLatin1().constData()).isNull()))
|
|
||||||
{
|
|
||||||
QFile coverFile(QString("%1/%2.%3").arg(lamexp_temp_folder2(), lamexp_rand_str(), extension));
|
|
||||||
if(coverFile.open(QIODevice::WriteOnly))
|
|
||||||
{
|
|
||||||
coverFile.write(coverData);
|
|
||||||
coverFile.close();
|
|
||||||
audioFile.setFileCover(coverFile.fileName(), true);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
qWarning("Image data seems to be invalid :-(");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
bool FileAnalyzer::analyzeAvisynthFile(const QString &filePath, AudioFileModel &info)
|
|
||||||
{
|
|
||||||
QProcess process;
|
|
||||||
process.setProcessChannelMode(QProcess::MergedChannels);
|
|
||||||
process.setReadChannel(QProcess::StandardOutput);
|
|
||||||
process.start(m_avs2wavBin, QStringList() << QDir::toNativeSeparators(filePath) << "?");
|
|
||||||
|
|
||||||
if(!process.waitForStarted())
|
|
||||||
{
|
|
||||||
qWarning("AVS2WAV process failed to create!");
|
|
||||||
qWarning("Error message: \"%s\"\n", process.errorString().toLatin1().constData());
|
|
||||||
process.kill();
|
|
||||||
process.waitForFinished(-1);
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool bInfoHeaderFound = false;
|
|
||||||
|
|
||||||
while(process.state() != QProcess::NotRunning)
|
|
||||||
{
|
|
||||||
if(m_abortFlag)
|
|
||||||
{
|
|
||||||
process.kill();
|
|
||||||
qWarning("Process was aborted on user request!");
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
if(!process.waitForReadyRead())
|
|
||||||
{
|
|
||||||
if(process.state() == QProcess::Running)
|
|
||||||
{
|
|
||||||
qWarning("AVS2WAV time out. Killing process and skipping file!");
|
|
||||||
process.kill();
|
|
||||||
process.waitForFinished(-1);
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
QByteArray data;
|
|
||||||
|
|
||||||
while(process.canReadLine())
|
|
||||||
{
|
|
||||||
QString line = QString::fromUtf8(process.readLine().constData()).simplified();
|
|
||||||
if(!line.isEmpty())
|
|
||||||
{
|
|
||||||
int index = line.indexOf(':');
|
|
||||||
if(index > 0)
|
|
||||||
{
|
|
||||||
QString key = line.left(index).trimmed();
|
|
||||||
QString val = line.mid(index+1).trimmed();
|
|
||||||
|
|
||||||
if(bInfoHeaderFound && !key.isEmpty() && !val.isEmpty())
|
|
||||||
{
|
|
||||||
if(key.compare("TotalSeconds", Qt::CaseInsensitive) == 0)
|
|
||||||
{
|
|
||||||
bool ok = false;
|
|
||||||
unsigned int duration = val.toUInt(&ok);
|
|
||||||
if(ok) info.setFileDuration(duration);
|
|
||||||
}
|
|
||||||
if(key.compare("SamplesPerSec", Qt::CaseInsensitive) == 0)
|
|
||||||
{
|
|
||||||
bool ok = false;
|
|
||||||
unsigned int samplerate = val.toUInt(&ok);
|
|
||||||
if(ok) info.setFormatAudioSamplerate (samplerate);
|
|
||||||
}
|
|
||||||
if(key.compare("Channels", Qt::CaseInsensitive) == 0)
|
|
||||||
{
|
|
||||||
bool ok = false;
|
|
||||||
unsigned int channels = val.toUInt(&ok);
|
|
||||||
if(ok) info.setFormatAudioChannels(channels);
|
|
||||||
}
|
|
||||||
if(key.compare("BitsPerSample", Qt::CaseInsensitive) == 0)
|
|
||||||
{
|
|
||||||
bool ok = false;
|
|
||||||
unsigned int bitdepth = val.toUInt(&ok);
|
|
||||||
if(ok) info.setFormatAudioBitdepth(bitdepth);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
if(line.contains("[Audio Info]", Qt::CaseInsensitive))
|
|
||||||
{
|
|
||||||
info.setFormatAudioType("Avisynth");
|
|
||||||
info.setFormatContainerType("Avisynth");
|
|
||||||
bInfoHeaderFound = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
process.waitForFinished();
|
|
||||||
if(process.state() != QProcess::NotRunning)
|
|
||||||
{
|
|
||||||
process.kill();
|
|
||||||
process.waitForFinished(-1);
|
|
||||||
}
|
|
||||||
|
|
||||||
//Check exit code
|
|
||||||
switch(process.exitCode())
|
|
||||||
{
|
|
||||||
case 0:
|
|
||||||
qDebug("Avisynth script was analyzed successfully.");
|
|
||||||
return true;
|
|
||||||
break;
|
|
||||||
case -5:
|
|
||||||
qWarning("It appears that Avisynth is not installed on the system!");
|
|
||||||
return false;
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
qWarning("Failed to open the Avisynth script, bad AVS file?");
|
|
||||||
return false;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
bool FileAnalyzer::createTemplate(void)
|
bool FileAnalyzer::createTemplate(void)
|
||||||
{
|
{
|
||||||
if(m_templateFile)
|
if(m_templateFile)
|
||||||
@ -749,69 +232,33 @@ bool FileAnalyzer::createTemplate(void)
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
unsigned int FileAnalyzer::parseYear(const QString &str)
|
|
||||||
{
|
|
||||||
if(str.startsWith("UTC", Qt::CaseInsensitive))
|
|
||||||
{
|
|
||||||
QDate date = QDate::fromString(str.mid(3).trimmed().left(10), "yyyy-MM-dd");
|
|
||||||
if(date.isValid())
|
|
||||||
{
|
|
||||||
return date.year();
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
bool ok = false;
|
|
||||||
int year = str.toInt(&ok);
|
|
||||||
if(ok && year > 0)
|
|
||||||
{
|
|
||||||
return year;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
unsigned int FileAnalyzer::parseDuration(const QString &str)
|
|
||||||
{
|
|
||||||
bool ok = false;
|
|
||||||
unsigned int value = str.toUInt(&ok);
|
|
||||||
return ok ? (value/1000) : 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////
|
||||||
// Public Functions
|
// Public Functions
|
||||||
////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
unsigned int FileAnalyzer::filesAccepted(void)
|
unsigned int FileAnalyzer::filesAccepted(void)
|
||||||
{
|
{
|
||||||
return m_filesAccepted;
|
return AnalyzeTask::filesAccepted();
|
||||||
}
|
}
|
||||||
|
|
||||||
unsigned int FileAnalyzer::filesRejected(void)
|
unsigned int FileAnalyzer::filesRejected(void)
|
||||||
{
|
{
|
||||||
return m_filesRejected;
|
return AnalyzeTask::filesRejected();
|
||||||
}
|
}
|
||||||
|
|
||||||
unsigned int FileAnalyzer::filesDenied(void)
|
unsigned int FileAnalyzer::filesDenied(void)
|
||||||
{
|
{
|
||||||
return m_filesDenied;
|
return AnalyzeTask::filesDenied();
|
||||||
}
|
}
|
||||||
|
|
||||||
unsigned int FileAnalyzer::filesDummyCDDA(void)
|
unsigned int FileAnalyzer::filesDummyCDDA(void)
|
||||||
{
|
{
|
||||||
return m_filesDummyCDDA;
|
return AnalyzeTask::filesDummyCDDA();
|
||||||
}
|
}
|
||||||
|
|
||||||
unsigned int FileAnalyzer::filesCueSheet(void)
|
unsigned int FileAnalyzer::filesCueSheet(void)
|
||||||
{
|
{
|
||||||
return m_filesCueSheet;
|
return AnalyzeTask::filesCueSheet();
|
||||||
}
|
}
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////
|
||||||
|
|||||||
@ -45,6 +45,7 @@ public:
|
|||||||
~FileAnalyzer(void);
|
~FileAnalyzer(void);
|
||||||
void run();
|
void run();
|
||||||
bool getSuccess(void) { return !isRunning() && m_bSuccess; }
|
bool getSuccess(void) { return !isRunning() && m_bSuccess; }
|
||||||
|
|
||||||
unsigned int filesAccepted(void);
|
unsigned int filesAccepted(void);
|
||||||
unsigned int filesRejected(void);
|
unsigned int filesRejected(void);
|
||||||
unsigned int filesDenied(void);
|
unsigned int filesDenied(void);
|
||||||
@ -59,40 +60,10 @@ public slots:
|
|||||||
void abortProcess(void) { m_abortFlag = true; }
|
void abortProcess(void) { m_abortFlag = true; }
|
||||||
|
|
||||||
private:
|
private:
|
||||||
enum cover_t
|
|
||||||
{
|
|
||||||
coverNone,
|
|
||||||
coverJpeg,
|
|
||||||
coverPng,
|
|
||||||
coverGif
|
|
||||||
};
|
|
||||||
enum fileType_t
|
|
||||||
{
|
|
||||||
fileTypeNormal = 0,
|
|
||||||
fileTypeCDDA = 1,
|
|
||||||
fileTypeDenied = 2,
|
|
||||||
fileTypeSkip = 3
|
|
||||||
};
|
|
||||||
|
|
||||||
const AudioFileModel analyzeFile(const QString &filePath, int *type);
|
const AudioFileModel analyzeFile(const QString &filePath, int *type);
|
||||||
void updateInfo(AudioFileModel &audioFile, bool *skipNext, unsigned int *id_val, cover_t *coverType, QByteArray *coverData, const QString &key, const QString &value);
|
|
||||||
unsigned int parseYear(const QString &str);
|
|
||||||
unsigned int parseDuration(const QString &str);
|
|
||||||
bool checkFile_CDDA(QFile &file);
|
|
||||||
void retrieveCover(AudioFileModel &audioFile, cover_t coverType, const QByteArray &coverData);
|
|
||||||
bool analyzeAvisynthFile(const QString &filePath, AudioFileModel &info);
|
|
||||||
bool createTemplate(void);
|
bool createTemplate(void);
|
||||||
|
|
||||||
const QString m_mediaInfoBin;
|
|
||||||
const QString m_avs2wavBin;
|
|
||||||
|
|
||||||
QStringList m_inputFiles;
|
QStringList m_inputFiles;
|
||||||
QStringList m_recentlyAdded;
|
|
||||||
unsigned int m_filesAccepted;
|
|
||||||
unsigned int m_filesRejected;
|
|
||||||
unsigned int m_filesDenied;
|
|
||||||
unsigned int m_filesDummyCDDA;
|
|
||||||
unsigned int m_filesCueSheet;
|
|
||||||
LockedFile *m_templateFile;
|
LockedFile *m_templateFile;
|
||||||
|
|
||||||
volatile bool m_abortFlag;
|
volatile bool m_abortFlag;
|
||||||
|
|||||||
767
src/Thread_FileAnalyzer_Task.cpp
Normal file
767
src/Thread_FileAnalyzer_Task.cpp
Normal file
@ -0,0 +1,767 @@
|
|||||||
|
///////////////////////////////////////////////////////////////////////////////
|
||||||
|
// LameXP - Audio Encoder Front-End
|
||||||
|
// Copyright (C) 2004-2012 LoRd_MuldeR <MuldeR2@GMX.de>
|
||||||
|
//
|
||||||
|
// This program is free software; you can redistribute it and/or modify
|
||||||
|
// it under the terms of the GNU General Public License as published by
|
||||||
|
// the Free Software Foundation; either version 2 of the License, or
|
||||||
|
// (at your option) any later version.
|
||||||
|
//
|
||||||
|
// This program is distributed in the hope that it will be useful,
|
||||||
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
// GNU General Public License for more details.
|
||||||
|
//
|
||||||
|
// You should have received a copy of the GNU General Public License along
|
||||||
|
// with this program; if not, write to the Free Software Foundation, Inc.,
|
||||||
|
// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||||
|
//
|
||||||
|
// http://www.gnu.org/licenses/gpl-2.0.txt
|
||||||
|
///////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
|
#include "Thread_FileAnalyzer_Task.h"
|
||||||
|
|
||||||
|
#include "Global.h"
|
||||||
|
#include "LockedFile.h"
|
||||||
|
#include "Model_AudioFile.h"
|
||||||
|
#include "PlaylistImporter.h"
|
||||||
|
|
||||||
|
#include <QDir>
|
||||||
|
#include <QFileInfo>
|
||||||
|
#include <QProcess>
|
||||||
|
#include <QDate>
|
||||||
|
#include <QTime>
|
||||||
|
#include <QDebug>
|
||||||
|
#include <QImage>
|
||||||
|
#include <QReadLocker>
|
||||||
|
#include <QWriteLocker>
|
||||||
|
#include <QThread>
|
||||||
|
|
||||||
|
#include <math.h>
|
||||||
|
#include <time.h>
|
||||||
|
|
||||||
|
#define IS_KEY(KEY) (key.compare(KEY, Qt::CaseInsensitive) == 0)
|
||||||
|
#define IS_SEC(SEC) (key.startsWith((SEC "_"), Qt::CaseInsensitive))
|
||||||
|
#define FIRST_TOK(STR) (STR.split(" ", QString::SkipEmptyParts).first())
|
||||||
|
|
||||||
|
/* static vars */
|
||||||
|
QReadWriteLock AnalyzeTask::s_lock;
|
||||||
|
unsigned __int64 AnalyzeTask::s_threadIdx_created;
|
||||||
|
unsigned __int64 AnalyzeTask::s_threadIdx_finished;
|
||||||
|
unsigned int AnalyzeTask::s_filesAccepted;
|
||||||
|
unsigned int AnalyzeTask::s_filesRejected;
|
||||||
|
unsigned int AnalyzeTask::s_filesDenied;
|
||||||
|
unsigned int AnalyzeTask::s_filesDummyCDDA;
|
||||||
|
unsigned int AnalyzeTask::s_filesCueSheet;
|
||||||
|
QStringList AnalyzeTask::s_additionalFiles;
|
||||||
|
QStringList AnalyzeTask::s_recentlyAdded;
|
||||||
|
|
||||||
|
////////////////////////////////////////////////////////////
|
||||||
|
// Constructor
|
||||||
|
////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
|
AnalyzeTask::AnalyzeTask(const QString &inputFile, const QString &templateFile, volatile bool *abortFlag)
|
||||||
|
:
|
||||||
|
m_threadIdx(makeThreadIdx()),
|
||||||
|
m_inputFile(inputFile),
|
||||||
|
m_templateFile(templateFile),
|
||||||
|
m_mediaInfoBin(lamexp_lookup_tool("mediainfo.exe")),
|
||||||
|
m_avs2wavBin(lamexp_lookup_tool("avs2wav.exe")),
|
||||||
|
m_abortFlag(abortFlag)
|
||||||
|
{
|
||||||
|
if(m_mediaInfoBin.isEmpty() || m_avs2wavBin.isEmpty())
|
||||||
|
{
|
||||||
|
qFatal("Invalid path to MediaInfo binary. Tool not initialized properly.");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
AnalyzeTask::~AnalyzeTask(void)
|
||||||
|
{
|
||||||
|
QWriteLocker lock(&s_lock);
|
||||||
|
s_threadIdx_finished = qMax(s_threadIdx_finished, m_threadIdx + 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
////////////////////////////////////////////////////////////
|
||||||
|
// Thread Main
|
||||||
|
////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
|
void AnalyzeTask::run(void)
|
||||||
|
{
|
||||||
|
int fileType = fileTypeNormal;
|
||||||
|
QString currentFile = QDir::fromNativeSeparators(m_inputFile);
|
||||||
|
qDebug("Analyzing: %s", currentFile.toUtf8().constData());
|
||||||
|
emit fileSelected(QFileInfo(currentFile).fileName());
|
||||||
|
AudioFileModel file = analyzeFile(currentFile, &fileType);
|
||||||
|
|
||||||
|
if(*m_abortFlag)
|
||||||
|
{
|
||||||
|
qWarning("Operation cancelled by user!");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if(fileType == fileTypeSkip)
|
||||||
|
{
|
||||||
|
qWarning("File was recently added, skipping!");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if(fileType == fileTypeDenied)
|
||||||
|
{
|
||||||
|
QWriteLocker lock(&s_lock);
|
||||||
|
s_filesDenied++;
|
||||||
|
qWarning("Cannot access file for reading, skipping!");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if(fileType == fileTypeCDDA)
|
||||||
|
{
|
||||||
|
QWriteLocker lock(&s_lock);
|
||||||
|
s_filesDummyCDDA++;
|
||||||
|
qWarning("Dummy CDDA file detected, skipping!");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if(file.fileName().isEmpty() || file.formatContainerType().isEmpty() || file.formatAudioType().isEmpty())
|
||||||
|
{
|
||||||
|
QStringList fileList;
|
||||||
|
if(PlaylistImporter::importPlaylist(fileList, currentFile))
|
||||||
|
{
|
||||||
|
QWriteLocker lock(&s_lock);
|
||||||
|
qDebug("Imported playlist file.");
|
||||||
|
s_additionalFiles << fileList;
|
||||||
|
}
|
||||||
|
else if(!QFileInfo(currentFile).suffix().compare("cue", Qt::CaseInsensitive))
|
||||||
|
{
|
||||||
|
QWriteLocker lock(&s_lock);
|
||||||
|
qWarning("Cue Sheet file detected, skipping!");
|
||||||
|
s_filesCueSheet++;
|
||||||
|
}
|
||||||
|
else if(!QFileInfo(currentFile).suffix().compare("avs", Qt::CaseInsensitive))
|
||||||
|
{
|
||||||
|
qDebug("Found a potential Avisynth script, investigating...");
|
||||||
|
if(analyzeAvisynthFile(currentFile, file))
|
||||||
|
{
|
||||||
|
QWriteLocker lock(&s_lock);
|
||||||
|
s_filesAccepted++;
|
||||||
|
s_recentlyAdded.append(file.filePath());
|
||||||
|
lock.unlock();
|
||||||
|
waitForPreviousThreads();
|
||||||
|
emit fileAnalyzed(file);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
QWriteLocker lock(&s_lock);
|
||||||
|
qDebug("Rejected Avisynth file: %s", file.filePath().toUtf8().constData());
|
||||||
|
s_filesRejected++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
QWriteLocker lock(&s_lock);
|
||||||
|
qDebug("Rejected file of unknown type: %s", file.filePath().toUtf8().constData());
|
||||||
|
s_filesRejected++;
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
QWriteLocker lock(&s_lock);
|
||||||
|
s_filesAccepted++;
|
||||||
|
s_recentlyAdded.append(file.filePath());
|
||||||
|
lock.unlock();
|
||||||
|
|
||||||
|
waitForPreviousThreads();
|
||||||
|
emit fileAnalyzed(file);
|
||||||
|
}
|
||||||
|
|
||||||
|
////////////////////////////////////////////////////////////
|
||||||
|
// Privtae Functions
|
||||||
|
////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
|
const AudioFileModel AnalyzeTask::analyzeFile(const QString &filePath, int *type)
|
||||||
|
{
|
||||||
|
*type = fileTypeNormal;
|
||||||
|
AudioFileModel audioFile(filePath);
|
||||||
|
|
||||||
|
QReadLocker readLock(&s_lock);
|
||||||
|
if(s_recentlyAdded.contains(filePath, Qt::CaseInsensitive))
|
||||||
|
{
|
||||||
|
*type = fileTypeSkip;
|
||||||
|
return audioFile;
|
||||||
|
}
|
||||||
|
readLock.unlock();
|
||||||
|
|
||||||
|
QFile readTest(filePath);
|
||||||
|
if(!readTest.open(QIODevice::ReadOnly))
|
||||||
|
{
|
||||||
|
*type = fileTypeDenied;
|
||||||
|
return audioFile;
|
||||||
|
}
|
||||||
|
if(checkFile_CDDA(readTest))
|
||||||
|
{
|
||||||
|
*type = fileTypeCDDA;
|
||||||
|
return audioFile;
|
||||||
|
}
|
||||||
|
readTest.close();
|
||||||
|
|
||||||
|
bool skipNext = false;
|
||||||
|
unsigned int id_val[2] = {UINT_MAX, UINT_MAX};
|
||||||
|
cover_t coverType = coverNone;
|
||||||
|
QByteArray coverData;
|
||||||
|
|
||||||
|
QStringList params;
|
||||||
|
params << QString("--Inform=file://%1").arg(QDir::toNativeSeparators(m_templateFile));
|
||||||
|
params << QDir::toNativeSeparators(filePath);
|
||||||
|
|
||||||
|
QProcess process;
|
||||||
|
process.setProcessChannelMode(QProcess::MergedChannels);
|
||||||
|
process.setReadChannel(QProcess::StandardOutput);
|
||||||
|
process.start(m_mediaInfoBin, params);
|
||||||
|
|
||||||
|
if(!process.waitForStarted())
|
||||||
|
{
|
||||||
|
qWarning("MediaInfo process failed to create!");
|
||||||
|
qWarning("Error message: \"%s\"\n", process.errorString().toLatin1().constData());
|
||||||
|
process.kill();
|
||||||
|
process.waitForFinished(-1);
|
||||||
|
return audioFile;
|
||||||
|
}
|
||||||
|
|
||||||
|
while(process.state() != QProcess::NotRunning)
|
||||||
|
{
|
||||||
|
if(*m_abortFlag)
|
||||||
|
{
|
||||||
|
process.kill();
|
||||||
|
qWarning("Process was aborted on user request!");
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
if(!process.waitForReadyRead())
|
||||||
|
{
|
||||||
|
if(process.state() == QProcess::Running)
|
||||||
|
{
|
||||||
|
qWarning("MediaInfo time out. Killing process and skipping file!");
|
||||||
|
process.kill();
|
||||||
|
process.waitForFinished(-1);
|
||||||
|
return audioFile;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
QByteArray data;
|
||||||
|
|
||||||
|
while(process.canReadLine())
|
||||||
|
{
|
||||||
|
QString line = QString::fromUtf8(process.readLine().constData()).simplified();
|
||||||
|
if(!line.isEmpty())
|
||||||
|
{
|
||||||
|
//qDebug("Line:%s", line.toUtf8().constData());
|
||||||
|
|
||||||
|
int index = line.indexOf('=');
|
||||||
|
if(index > 0)
|
||||||
|
{
|
||||||
|
QString key = line.left(index).trimmed();
|
||||||
|
QString val = line.mid(index+1).trimmed();
|
||||||
|
if(!key.isEmpty())
|
||||||
|
{
|
||||||
|
updateInfo(audioFile, &skipNext, id_val, &coverType, &coverData, key, val);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if(audioFile.fileName().isEmpty())
|
||||||
|
{
|
||||||
|
QString baseName = QFileInfo(filePath).fileName();
|
||||||
|
int index = baseName.lastIndexOf(".");
|
||||||
|
|
||||||
|
if(index >= 0)
|
||||||
|
{
|
||||||
|
baseName = baseName.left(index);
|
||||||
|
}
|
||||||
|
|
||||||
|
baseName = baseName.replace("_", " ").simplified();
|
||||||
|
index = baseName.lastIndexOf(" - ");
|
||||||
|
|
||||||
|
if(index >= 0)
|
||||||
|
{
|
||||||
|
baseName = baseName.mid(index + 3).trimmed();
|
||||||
|
}
|
||||||
|
|
||||||
|
audioFile.setFileName(baseName);
|
||||||
|
}
|
||||||
|
|
||||||
|
process.waitForFinished();
|
||||||
|
if(process.state() != QProcess::NotRunning)
|
||||||
|
{
|
||||||
|
process.kill();
|
||||||
|
process.waitForFinished(-1);
|
||||||
|
}
|
||||||
|
|
||||||
|
if((coverType != coverNone) && (!coverData.isEmpty()))
|
||||||
|
{
|
||||||
|
retrieveCover(audioFile, coverType, coverData);
|
||||||
|
}
|
||||||
|
|
||||||
|
return audioFile;
|
||||||
|
}
|
||||||
|
|
||||||
|
void AnalyzeTask::updateInfo(AudioFileModel &audioFile, bool *skipNext, unsigned int *id_val, cover_t *coverType, QByteArray *coverData, const QString &key, const QString &value)
|
||||||
|
{
|
||||||
|
//qWarning("'%s' -> '%s'", key.toUtf8().constData(), value.toUtf8().constData());
|
||||||
|
|
||||||
|
/*New Stream*/
|
||||||
|
if(IS_KEY("Gen_ID") || IS_KEY("Aud_ID"))
|
||||||
|
{
|
||||||
|
if(value.isEmpty())
|
||||||
|
{
|
||||||
|
*skipNext = false;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
//We ignore all ID's, except for the lowest one!
|
||||||
|
bool ok = false;
|
||||||
|
unsigned int id = value.toUInt(&ok);
|
||||||
|
if(ok)
|
||||||
|
{
|
||||||
|
if(IS_KEY("Gen_ID")) { id_val[0] = qMin(id_val[0], id); *skipNext = (id > id_val[0]); }
|
||||||
|
if(IS_KEY("Aud_ID")) { id_val[1] = qMin(id_val[1], id); *skipNext = (id > id_val[1]); }
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
*skipNext = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if(*skipNext)
|
||||||
|
{
|
||||||
|
qWarning("Skipping info for non-primary stream!");
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*Skip or empty?*/
|
||||||
|
if((*skipNext) || value.isEmpty())
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*Playlist file?*/
|
||||||
|
if(IS_KEY("Aud_Source"))
|
||||||
|
{
|
||||||
|
*skipNext = true;
|
||||||
|
audioFile.setFormatContainerType(QString());
|
||||||
|
audioFile.setFormatAudioType(QString());
|
||||||
|
qWarning("Skipping info for playlist file!");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*General Section*/
|
||||||
|
if(IS_SEC("Gen"))
|
||||||
|
{
|
||||||
|
if(IS_KEY("Gen_Format"))
|
||||||
|
{
|
||||||
|
audioFile.setFormatContainerType(value);
|
||||||
|
}
|
||||||
|
else if(IS_KEY("Gen_Format_Profile"))
|
||||||
|
{
|
||||||
|
audioFile.setFormatContainerProfile(value);
|
||||||
|
}
|
||||||
|
else if(IS_KEY("Gen_Title") || IS_KEY("Gen_Track"))
|
||||||
|
{
|
||||||
|
audioFile.setFileName(value);
|
||||||
|
}
|
||||||
|
else if(IS_KEY("Gen_Duration"))
|
||||||
|
{
|
||||||
|
unsigned int tmp = parseDuration(value);
|
||||||
|
if(tmp > 0) audioFile.setFileDuration(tmp);
|
||||||
|
}
|
||||||
|
else if(IS_KEY("Gen_Artist") || IS_KEY("Gen_Performer"))
|
||||||
|
{
|
||||||
|
audioFile.setFileArtist(value);
|
||||||
|
}
|
||||||
|
else if(IS_KEY("Gen_Album"))
|
||||||
|
{
|
||||||
|
audioFile.setFileAlbum(value);
|
||||||
|
}
|
||||||
|
else if(IS_KEY("Gen_Genre"))
|
||||||
|
{
|
||||||
|
audioFile.setFileGenre(value);
|
||||||
|
}
|
||||||
|
else if(IS_KEY("Gen_Released_Date") || IS_KEY("Gen_Recorded_Date"))
|
||||||
|
{
|
||||||
|
unsigned int tmp = parseYear(value);
|
||||||
|
if(tmp > 0) audioFile.setFileYear(tmp);
|
||||||
|
}
|
||||||
|
else if(IS_KEY("Gen_Comment"))
|
||||||
|
{
|
||||||
|
audioFile.setFileComment(value);
|
||||||
|
}
|
||||||
|
else if(IS_KEY("Gen_Track/Position"))
|
||||||
|
{
|
||||||
|
bool ok = false;
|
||||||
|
unsigned int tmp = value.toUInt(&ok);
|
||||||
|
if(ok) audioFile.setFilePosition(tmp);
|
||||||
|
}
|
||||||
|
else if(IS_KEY("Gen_Cover") || IS_KEY("Gen_Cover_Type"))
|
||||||
|
{
|
||||||
|
if(*coverType == coverNone)
|
||||||
|
{
|
||||||
|
*coverType = coverJpeg;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else if(IS_KEY("Gen_Cover_Mime"))
|
||||||
|
{
|
||||||
|
QString temp = FIRST_TOK(value);
|
||||||
|
if(!temp.compare("image/jpeg", Qt::CaseInsensitive)) *coverType = coverJpeg;
|
||||||
|
else if(!temp.compare("image/png", Qt::CaseInsensitive)) *coverType = coverPng;
|
||||||
|
else if(!temp.compare("image/gif", Qt::CaseInsensitive)) *coverType = coverGif;
|
||||||
|
}
|
||||||
|
else if(IS_KEY("Gen_Cover_Data"))
|
||||||
|
{
|
||||||
|
if(!coverData->isEmpty()) coverData->clear();
|
||||||
|
coverData->append(QByteArray::fromBase64(FIRST_TOK(value).toLatin1()));
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
qWarning("Unknown key '%s' with value '%s' found!", key.toUtf8().constData(), value.toUtf8().constData());
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*Audio Section*/
|
||||||
|
if(IS_SEC("Aud"))
|
||||||
|
{
|
||||||
|
|
||||||
|
if(IS_KEY("Aud_Format"))
|
||||||
|
{
|
||||||
|
audioFile.setFormatAudioType(value);
|
||||||
|
}
|
||||||
|
else if(IS_KEY("Aud_Format_Profile"))
|
||||||
|
{
|
||||||
|
audioFile.setFormatAudioProfile(value);
|
||||||
|
}
|
||||||
|
else if(IS_KEY("Aud_Format_Version"))
|
||||||
|
{
|
||||||
|
audioFile.setFormatAudioVersion(value);
|
||||||
|
}
|
||||||
|
else if(IS_KEY("Aud_Channel(s)"))
|
||||||
|
{
|
||||||
|
bool ok = false;
|
||||||
|
unsigned int tmp = value.toUInt(&ok);
|
||||||
|
if(ok) audioFile.setFormatAudioChannels(tmp);
|
||||||
|
}
|
||||||
|
else if(IS_KEY("Aud_SamplingRate"))
|
||||||
|
{
|
||||||
|
bool ok = false;
|
||||||
|
unsigned int tmp = value.toUInt(&ok);
|
||||||
|
if(ok) audioFile.setFormatAudioSamplerate(tmp);
|
||||||
|
}
|
||||||
|
else if(IS_KEY("Aud_BitDepth"))
|
||||||
|
{
|
||||||
|
bool ok = false;
|
||||||
|
unsigned int tmp = value.toUInt(&ok);
|
||||||
|
if(ok) audioFile.setFormatAudioBitdepth(tmp);
|
||||||
|
}
|
||||||
|
else if(IS_KEY("Aud_Duration"))
|
||||||
|
{
|
||||||
|
unsigned int tmp = parseDuration(value);
|
||||||
|
if(tmp > 0) audioFile.setFileDuration(tmp);
|
||||||
|
}
|
||||||
|
else if(IS_KEY("Aud_BitRate"))
|
||||||
|
{
|
||||||
|
bool ok = false;
|
||||||
|
unsigned int tmp = value.toUInt(&ok);
|
||||||
|
if(ok) audioFile.setFormatAudioBitrate(tmp/1000);
|
||||||
|
}
|
||||||
|
else if(IS_KEY("Aud_BitRate_Mode"))
|
||||||
|
{
|
||||||
|
if(!value.compare("CBR", Qt::CaseInsensitive)) audioFile.setFormatAudioBitrateMode(AudioFileModel::BitrateModeConstant);
|
||||||
|
if(!value.compare("VBR", Qt::CaseInsensitive)) audioFile.setFormatAudioBitrateMode(AudioFileModel::BitrateModeVariable);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
qWarning("Unknown key '%s' with value '%s' found!", key.toUtf8().constData(), value.toUtf8().constData());
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*Section not recognized*/
|
||||||
|
qWarning("Unknown section: %s", key.toUtf8().constData());
|
||||||
|
}
|
||||||
|
|
||||||
|
bool AnalyzeTask::checkFile_CDDA(QFile &file)
|
||||||
|
{
|
||||||
|
file.reset();
|
||||||
|
QByteArray data = file.read(128);
|
||||||
|
|
||||||
|
int i = data.indexOf("RIFF");
|
||||||
|
int j = data.indexOf("CDDA");
|
||||||
|
int k = data.indexOf("fmt ");
|
||||||
|
|
||||||
|
return ((i >= 0) && (j >= 0) && (k >= 0) && (k > j) && (j > i));
|
||||||
|
}
|
||||||
|
|
||||||
|
void AnalyzeTask::retrieveCover(AudioFileModel &audioFile, cover_t coverType, const QByteArray &coverData)
|
||||||
|
{
|
||||||
|
qDebug("Retrieving cover!");
|
||||||
|
QString extension;
|
||||||
|
|
||||||
|
switch(coverType)
|
||||||
|
{
|
||||||
|
case coverPng:
|
||||||
|
extension = QString::fromLatin1("png");
|
||||||
|
break;
|
||||||
|
case coverGif:
|
||||||
|
extension = QString::fromLatin1("gif");
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
extension = QString::fromLatin1("jpg");
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
if(!(QImage::fromData(coverData, extension.toUpper().toLatin1().constData()).isNull()))
|
||||||
|
{
|
||||||
|
QFile coverFile(QString("%1/%2.%3").arg(lamexp_temp_folder2(), lamexp_rand_str(), extension));
|
||||||
|
if(coverFile.open(QIODevice::WriteOnly))
|
||||||
|
{
|
||||||
|
coverFile.write(coverData);
|
||||||
|
coverFile.close();
|
||||||
|
audioFile.setFileCover(coverFile.fileName(), true);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
qWarning("Image data seems to be invalid :-(");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
bool AnalyzeTask::analyzeAvisynthFile(const QString &filePath, AudioFileModel &info)
|
||||||
|
{
|
||||||
|
QProcess process;
|
||||||
|
process.setProcessChannelMode(QProcess::MergedChannels);
|
||||||
|
process.setReadChannel(QProcess::StandardOutput);
|
||||||
|
process.start(m_avs2wavBin, QStringList() << QDir::toNativeSeparators(filePath) << "?");
|
||||||
|
|
||||||
|
if(!process.waitForStarted())
|
||||||
|
{
|
||||||
|
qWarning("AVS2WAV process failed to create!");
|
||||||
|
qWarning("Error message: \"%s\"\n", process.errorString().toLatin1().constData());
|
||||||
|
process.kill();
|
||||||
|
process.waitForFinished(-1);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool bInfoHeaderFound = false;
|
||||||
|
|
||||||
|
while(process.state() != QProcess::NotRunning)
|
||||||
|
{
|
||||||
|
if(*m_abortFlag)
|
||||||
|
{
|
||||||
|
process.kill();
|
||||||
|
qWarning("Process was aborted on user request!");
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
if(!process.waitForReadyRead())
|
||||||
|
{
|
||||||
|
if(process.state() == QProcess::Running)
|
||||||
|
{
|
||||||
|
qWarning("AVS2WAV time out. Killing process and skipping file!");
|
||||||
|
process.kill();
|
||||||
|
process.waitForFinished(-1);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
QByteArray data;
|
||||||
|
|
||||||
|
while(process.canReadLine())
|
||||||
|
{
|
||||||
|
QString line = QString::fromUtf8(process.readLine().constData()).simplified();
|
||||||
|
if(!line.isEmpty())
|
||||||
|
{
|
||||||
|
int index = line.indexOf(':');
|
||||||
|
if(index > 0)
|
||||||
|
{
|
||||||
|
QString key = line.left(index).trimmed();
|
||||||
|
QString val = line.mid(index+1).trimmed();
|
||||||
|
|
||||||
|
if(bInfoHeaderFound && !key.isEmpty() && !val.isEmpty())
|
||||||
|
{
|
||||||
|
if(key.compare("TotalSeconds", Qt::CaseInsensitive) == 0)
|
||||||
|
{
|
||||||
|
bool ok = false;
|
||||||
|
unsigned int duration = val.toUInt(&ok);
|
||||||
|
if(ok) info.setFileDuration(duration);
|
||||||
|
}
|
||||||
|
if(key.compare("SamplesPerSec", Qt::CaseInsensitive) == 0)
|
||||||
|
{
|
||||||
|
bool ok = false;
|
||||||
|
unsigned int samplerate = val.toUInt(&ok);
|
||||||
|
if(ok) info.setFormatAudioSamplerate (samplerate);
|
||||||
|
}
|
||||||
|
if(key.compare("Channels", Qt::CaseInsensitive) == 0)
|
||||||
|
{
|
||||||
|
bool ok = false;
|
||||||
|
unsigned int channels = val.toUInt(&ok);
|
||||||
|
if(ok) info.setFormatAudioChannels(channels);
|
||||||
|
}
|
||||||
|
if(key.compare("BitsPerSample", Qt::CaseInsensitive) == 0)
|
||||||
|
{
|
||||||
|
bool ok = false;
|
||||||
|
unsigned int bitdepth = val.toUInt(&ok);
|
||||||
|
if(ok) info.setFormatAudioBitdepth(bitdepth);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
if(line.contains("[Audio Info]", Qt::CaseInsensitive))
|
||||||
|
{
|
||||||
|
info.setFormatAudioType("Avisynth");
|
||||||
|
info.setFormatContainerType("Avisynth");
|
||||||
|
bInfoHeaderFound = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
process.waitForFinished();
|
||||||
|
if(process.state() != QProcess::NotRunning)
|
||||||
|
{
|
||||||
|
process.kill();
|
||||||
|
process.waitForFinished(-1);
|
||||||
|
}
|
||||||
|
|
||||||
|
//Check exit code
|
||||||
|
switch(process.exitCode())
|
||||||
|
{
|
||||||
|
case 0:
|
||||||
|
qDebug("Avisynth script was analyzed successfully.");
|
||||||
|
return true;
|
||||||
|
break;
|
||||||
|
case -5:
|
||||||
|
qWarning("It appears that Avisynth is not installed on the system!");
|
||||||
|
return false;
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
qWarning("Failed to open the Avisynth script, bad AVS file?");
|
||||||
|
return false;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
unsigned int AnalyzeTask::parseYear(const QString &str)
|
||||||
|
{
|
||||||
|
if(str.startsWith("UTC", Qt::CaseInsensitive))
|
||||||
|
{
|
||||||
|
QDate date = QDate::fromString(str.mid(3).trimmed().left(10), "yyyy-MM-dd");
|
||||||
|
if(date.isValid())
|
||||||
|
{
|
||||||
|
return date.year();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
bool ok = false;
|
||||||
|
int year = str.toInt(&ok);
|
||||||
|
if(ok && year > 0)
|
||||||
|
{
|
||||||
|
return year;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
unsigned int AnalyzeTask::parseDuration(const QString &str)
|
||||||
|
{
|
||||||
|
bool ok = false;
|
||||||
|
unsigned int value = str.toUInt(&ok);
|
||||||
|
return ok ? (value/1000) : 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
unsigned __int64 AnalyzeTask::makeThreadIdx(void)
|
||||||
|
{
|
||||||
|
QWriteLocker lock(&s_lock);
|
||||||
|
return s_threadIdx_created++;
|
||||||
|
}
|
||||||
|
|
||||||
|
void AnalyzeTask::waitForPreviousThreads(void)
|
||||||
|
{
|
||||||
|
for(int i = 0; i < 240; i++)
|
||||||
|
{
|
||||||
|
QReadLocker lock(&s_lock);
|
||||||
|
if((s_threadIdx_finished >= m_threadIdx) || *m_abortFlag)
|
||||||
|
{
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
lock.unlock();
|
||||||
|
Sleep(125);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
////////////////////////////////////////////////////////////
|
||||||
|
// Public Functions
|
||||||
|
////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
|
unsigned int AnalyzeTask::filesAccepted(void)
|
||||||
|
{
|
||||||
|
QReadLocker lock(&s_lock);
|
||||||
|
return s_filesAccepted;
|
||||||
|
}
|
||||||
|
|
||||||
|
unsigned int AnalyzeTask::filesRejected(void)
|
||||||
|
{
|
||||||
|
QReadLocker lock(&s_lock);
|
||||||
|
return s_filesRejected;
|
||||||
|
}
|
||||||
|
|
||||||
|
unsigned int AnalyzeTask::filesDenied(void)
|
||||||
|
{
|
||||||
|
QReadLocker lock(&s_lock);
|
||||||
|
return s_filesDenied;
|
||||||
|
}
|
||||||
|
|
||||||
|
unsigned int AnalyzeTask::filesDummyCDDA(void)
|
||||||
|
{
|
||||||
|
QReadLocker lock(&s_lock);
|
||||||
|
return s_filesDummyCDDA;
|
||||||
|
}
|
||||||
|
|
||||||
|
unsigned int AnalyzeTask::filesCueSheet(void)
|
||||||
|
{
|
||||||
|
QReadLocker lock(&s_lock);
|
||||||
|
return s_filesCueSheet;
|
||||||
|
}
|
||||||
|
|
||||||
|
void AnalyzeTask::getAdditionalFiles(QStringList &fileList)
|
||||||
|
{
|
||||||
|
QReadLocker lock(&s_lock);
|
||||||
|
fileList << s_additionalFiles;
|
||||||
|
s_additionalFiles.clear();
|
||||||
|
}
|
||||||
|
|
||||||
|
void AnalyzeTask::reset(void)
|
||||||
|
{
|
||||||
|
QWriteLocker lock(&s_lock);
|
||||||
|
|
||||||
|
s_threadIdx_created = 0;
|
||||||
|
s_threadIdx_finished = 0;
|
||||||
|
s_filesAccepted = 0;
|
||||||
|
s_filesRejected = 0;
|
||||||
|
s_filesDenied = 0;
|
||||||
|
s_filesDummyCDDA = 0;
|
||||||
|
s_filesCueSheet = 0;
|
||||||
|
s_additionalFiles.clear();
|
||||||
|
s_recentlyAdded.clear();
|
||||||
|
}
|
||||||
|
|
||||||
|
////////////////////////////////////////////////////////////
|
||||||
|
// EVENTS
|
||||||
|
////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
|
/*NONE*/
|
||||||
107
src/Thread_FileAnalyzer_Task.h
Normal file
107
src/Thread_FileAnalyzer_Task.h
Normal file
@ -0,0 +1,107 @@
|
|||||||
|
///////////////////////////////////////////////////////////////////////////////
|
||||||
|
// LameXP - Audio Encoder Front-End
|
||||||
|
// Copyright (C) 2004-2012 LoRd_MuldeR <MuldeR2@GMX.de>
|
||||||
|
//
|
||||||
|
// This program is free software; you can redistribute it and/or modify
|
||||||
|
// it under the terms of the GNU General Public License as published by
|
||||||
|
// the Free Software Foundation; either version 2 of the License, or
|
||||||
|
// (at your option) any later version.
|
||||||
|
//
|
||||||
|
// This program is distributed in the hope that it will be useful,
|
||||||
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
// GNU General Public License for more details.
|
||||||
|
//
|
||||||
|
// You should have received a copy of the GNU General Public License along
|
||||||
|
// with this program; if not, write to the Free Software Foundation, Inc.,
|
||||||
|
// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||||
|
//
|
||||||
|
// http://www.gnu.org/licenses/gpl-2.0.txt
|
||||||
|
///////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include <QRunnable>
|
||||||
|
#include <QReadWriteLock>
|
||||||
|
#include <QStringList>
|
||||||
|
|
||||||
|
class AudioFileModel;
|
||||||
|
class QFile;
|
||||||
|
class QDir;
|
||||||
|
class QFileInfo;
|
||||||
|
class LockedFile;
|
||||||
|
|
||||||
|
////////////////////////////////////////////////////////////
|
||||||
|
// Splash Thread
|
||||||
|
////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
|
class AnalyzeTask: public QObject, public QRunnable
|
||||||
|
{
|
||||||
|
Q_OBJECT
|
||||||
|
|
||||||
|
public:
|
||||||
|
AnalyzeTask(const QString &inputFile, const QString &templateFile, volatile bool *abortFlag);
|
||||||
|
~AnalyzeTask(void);
|
||||||
|
|
||||||
|
static void reset(void);
|
||||||
|
static void getAdditionalFiles(QStringList &fileList);
|
||||||
|
static unsigned int filesAccepted(void);
|
||||||
|
static unsigned int filesRejected(void);
|
||||||
|
static unsigned int filesDenied(void);
|
||||||
|
static unsigned int filesDummyCDDA(void);
|
||||||
|
static unsigned int filesCueSheet(void);
|
||||||
|
|
||||||
|
signals:
|
||||||
|
void fileSelected(const QString &fileName);
|
||||||
|
void fileAnalyzed(const AudioFileModel &file);
|
||||||
|
|
||||||
|
protected:
|
||||||
|
void run(void);
|
||||||
|
|
||||||
|
private:
|
||||||
|
enum cover_t
|
||||||
|
{
|
||||||
|
coverNone,
|
||||||
|
coverJpeg,
|
||||||
|
coverPng,
|
||||||
|
coverGif
|
||||||
|
};
|
||||||
|
enum fileType_t
|
||||||
|
{
|
||||||
|
fileTypeNormal = 0,
|
||||||
|
fileTypeCDDA = 1,
|
||||||
|
fileTypeDenied = 2,
|
||||||
|
fileTypeSkip = 3
|
||||||
|
};
|
||||||
|
|
||||||
|
const AudioFileModel analyzeFile(const QString &filePath, int *type);
|
||||||
|
void updateInfo(AudioFileModel &audioFile, bool *skipNext, unsigned int *id_val, cover_t *coverType, QByteArray *coverData, const QString &key, const QString &value);
|
||||||
|
unsigned int parseYear(const QString &str);
|
||||||
|
unsigned int parseDuration(const QString &str);
|
||||||
|
bool checkFile_CDDA(QFile &file);
|
||||||
|
void retrieveCover(AudioFileModel &audioFile, cover_t coverType, const QByteArray &coverData);
|
||||||
|
bool analyzeAvisynthFile(const QString &filePath, AudioFileModel &info);
|
||||||
|
void waitForPreviousThreads(void);
|
||||||
|
|
||||||
|
const unsigned __int64 m_threadIdx;
|
||||||
|
|
||||||
|
const QString m_mediaInfoBin;
|
||||||
|
const QString m_avs2wavBin;
|
||||||
|
const QString m_templateFile;
|
||||||
|
const QString m_inputFile;
|
||||||
|
|
||||||
|
volatile bool *m_abortFlag;
|
||||||
|
|
||||||
|
static QReadWriteLock s_lock;
|
||||||
|
static unsigned __int64 s_threadIdx_created;
|
||||||
|
static unsigned __int64 s_threadIdx_finished;
|
||||||
|
static unsigned int s_filesAccepted;
|
||||||
|
static unsigned int s_filesRejected;
|
||||||
|
static unsigned int s_filesDenied;
|
||||||
|
static unsigned int s_filesDummyCDDA;
|
||||||
|
static unsigned int s_filesCueSheet;
|
||||||
|
static QStringList s_recentlyAdded;
|
||||||
|
static QStringList s_additionalFiles;
|
||||||
|
|
||||||
|
static unsigned __int64 makeThreadIdx(void);
|
||||||
|
};
|
||||||
@ -66,7 +66,7 @@ public:
|
|||||||
static char *const getError(void) { return s_errMsg; }
|
static char *const getError(void) { return s_errMsg; }
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
void run()
|
void run(void)
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user