From 10001f4ef07aa25fc23e1f4c270dd707f75790ad Mon Sep 17 00:00:00 2001 From: LoRd_MuldeR Date: Wed, 9 Oct 2013 01:07:19 +0200 Subject: [PATCH] Fixed compilation with VS2010 and removed an obsolete file. --- LameXP_VS2010.vcxproj | 30 +- LameXP_VS2010.vcxproj.filters | 27 +- LameXP_VS2012.vcxproj | 18 +- LameXP_VS2012.vcxproj.filters | 15 +- src/Config.h | 2 +- src/Thread_FileAnalyzer_ST.cpp | 826 --------------------------------- src/Thread_FileAnalyzer_ST.h | 107 ----- 7 files changed, 35 insertions(+), 990 deletions(-) delete mode 100644 src/Thread_FileAnalyzer_ST.cpp delete mode 100644 src/Thread_FileAnalyzer_ST.h diff --git a/LameXP_VS2010.vcxproj b/LameXP_VS2010.vcxproj index 3be32501..06edff68 100644 --- a/LameXP_VS2010.vcxproj +++ b/LameXP_VS2010.vcxproj @@ -76,7 +76,7 @@ Disabled $(QTDIR)\include;$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(SolutionDir)\etc\Prerequisites\VisualLeakDetector\include;$(SolutionDir)\etc\Prerequisites\keccak\include;$(SolutionDir)\etc\Prerequisites\strnatcmp\include;%(AdditionalIncludeDirectories) - _CONFIG_NAME=$(ConfigurationName);WIN32;_DEBUG;_CONSOLE;QT_LARGEFILE_SUPPORT;QT_GUI_LIB;QT_CORE_LIB;QT_THREAD_SUPPORT;QT_DLL;QT_DEBUG;%(PreprocessorDefinitions) + _CONFIG_NAME=$(ConfigurationName);WIN32;_DEBUG;_CONSOLE;QT_GUI_LIB;QT_CORE_LIB;QT_THREAD_SUPPORT;QT_DLL;QT_DEBUG;%(PreprocessorDefinitions) false EnableFastChecks MultiThreadedDebugDLL @@ -125,7 +125,7 @@ copy /Y "$(SolutionDir)\etc\Prerequisites\VisualLeakDetector\bin\Win32\*.manifes true true $(QTDIR)\include;$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(SolutionDir)\etc\Prerequisites\VisualLeakDetector\include;$(SolutionDir)\etc\Prerequisites\keccak\include;$(SolutionDir)\etc\Prerequisites\strnatcmp\include;%(AdditionalIncludeDirectories) - _CONFIG_NAME=$(ConfigurationName);WIN32;NDEBUG;_CONSOLE;QT_LARGEFILE_SUPPORT;QT_GUI_LIB;QT_CORE_LIB;QT_THREAD_SUPPORT;QT_DLL;QT_NO_DEBUG;%(PreprocessorDefinitions) + _CONFIG_NAME=$(ConfigurationName);WIN32;NDEBUG;_CONSOLE;QT_GUI_LIB;QT_CORE_LIB;QT_THREAD_SUPPORT;QT_DLL;QT_NO_DEBUG;%(PreprocessorDefinitions) false Default MultiThreadedDLL @@ -197,7 +197,7 @@ del "$(TargetDir)imageformats\q???d4.dll" true true $(QTDIR)\include;$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(SolutionDir)\etc\Prerequisites\VisualLeakDetector\include;$(SolutionDir)\etc\Prerequisites\keccak\include;$(SolutionDir)\etc\Prerequisites\strnatcmp\include;%(AdditionalIncludeDirectories) - _CONFIG_NAME=$(ConfigurationName);WIN32;NDEBUG;_CONSOLE;QT_LARGEFILE_SUPPORT;QT_GUI_LIB;QT_CORE_LIB;QT_THREAD_SUPPORT;QT_NO_DEBUG;QT_NODLL;%(PreprocessorDefinitions) + _CONFIG_NAME=$(ConfigurationName);WIN32;NDEBUG;_CONSOLE;QT_GUI_LIB;QT_CORE_LIB;QT_THREAD_SUPPORT;QT_NO_DEBUG;QT_NODLL;%(PreprocessorDefinitions) false Default MultiThreaded @@ -218,7 +218,7 @@ del "$(TargetDir)imageformats\q???d4.dll" "/MANIFESTDEPENDENCY:type=%27win32%27 name=%27Microsoft.Windows.Common-Controls%27 version=%276.0.0.0%27 publicKeyToken=%276595b64144ccf1df%27 language=%27*%27 processorArchitecture=%27*%27" %(AdditionalOptions) qtmain.lib;QtCore.lib;QtGui.lib;QtSvg.lib;qsvg.lib;qico.lib;qtga.lib;Winmm.lib;imm32.lib;ws2_32.lib;Shlwapi.lib;Wininet.lib;PowrProf.lib;Psapi.lib;QKeccakHash_VS2010.lib;EncodePointer.lib;%(AdditionalDependencies) LinkVerboseLib - $(SolutionDir)\etc\Prerequisites\qt4_static.VS2010\lib;$(SolutionDir)\etc\Prerequisites\qt4_static.VS2010\plugins\imageformats;$(SolutionDir)\etc\Prerequisites\EncodePointer\lib;$(SolutionDir)\etc\Prerequisites\VisualLeakDetector\lib\Win32;$(SolutionDir)\etc\Prerequisites\keccak\lib\$(Configuration);%(AdditionalLibraryDirectories) + $(SolutionDir)\etc\Prerequisites\z_old\qt4_static.VS2010\lib;$(SolutionDir)\etc\Prerequisites\z_old\qt4_static.VS2010\plugins\imageformats;$(SolutionDir)\etc\Prerequisites\EncodePointer\lib;$(SolutionDir)\etc\Prerequisites\VisualLeakDetector\lib\Win32;$(SolutionDir)\etc\Prerequisites\keccak\lib\$(Configuration);%(AdditionalLibraryDirectories) %(IgnoreSpecificDefaultLibraries) false @@ -293,6 +293,7 @@ del "$(TargetDir)imageformats\q???d4.dll" + @@ -305,16 +306,12 @@ del "$(TargetDir)imageformats\q???d4.dll" + - - true - true - true - @@ -359,7 +356,6 @@ del "$(TargetDir)imageformats\q???d4.dll" - @@ -378,6 +374,7 @@ del "$(TargetDir)imageformats\q???d4.dll" + "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" @@ -502,17 +499,6 @@ del "$(TargetDir)imageformats\q???d4.dll" $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) - - "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" - "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" - "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" - MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" - MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" - MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" - $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) - $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) - $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) - "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" @@ -525,6 +511,8 @@ del "$(TargetDir)imageformats\q???d4.dll" $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) + + "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" diff --git a/LameXP_VS2010.vcxproj.filters b/LameXP_VS2010.vcxproj.filters index 0ad6314c..fc607db3 100644 --- a/LameXP_VS2010.vcxproj.filters +++ b/LameXP_VS2010.vcxproj.filters @@ -358,12 +358,6 @@ Generated Files\MOC - - Source Files\Threads - - - Generated Files\MOC - Source Files\Encoders @@ -379,6 +373,12 @@ Source Files\Misc\3rd Party + + Source Files\Misc + + + Source Files\Misc + @@ -507,6 +507,15 @@ Header Files\Decoders + + Header Files\Misc + + + Header Files\Misc + + + Header Files\Misc\3rd Party + @@ -686,9 +695,6 @@ Header Files\Threads - - Header Files\Threads - Header Files\Encoders @@ -773,5 +779,8 @@ {e46f4cc1-5aac-4532-90f4-fc3dfe88350d} + + {cbf43849-15bc-446f-894b-a5ffd74270e2} + \ No newline at end of file diff --git a/LameXP_VS2012.vcxproj b/LameXP_VS2012.vcxproj index a59b26ff..bb7fe296 100644 --- a/LameXP_VS2012.vcxproj +++ b/LameXP_VS2012.vcxproj @@ -331,11 +331,6 @@ del "$(TargetDir)imageformats\q???d4.dll" - - true - true - true - @@ -381,7 +376,6 @@ del "$(TargetDir)imageformats\q???d4.dll" - @@ -400,6 +394,7 @@ del "$(TargetDir)imageformats\q???d4.dll" + "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" @@ -524,17 +519,6 @@ del "$(TargetDir)imageformats\q???d4.dll" $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) - - "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" - "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" - "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" - MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" - MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" - MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" - $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) - $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) - $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) - "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" diff --git a/LameXP_VS2012.vcxproj.filters b/LameXP_VS2012.vcxproj.filters index eb456401..0e3348c7 100644 --- a/LameXP_VS2012.vcxproj.filters +++ b/LameXP_VS2012.vcxproj.filters @@ -358,12 +358,6 @@ Generated Files\MOC - - Source Files\Threads - - - Generated Files\MOC - Source Files\Encoders @@ -522,6 +516,9 @@ Header Files\Misc + + Header Files\Misc\3rd Party + @@ -701,9 +698,6 @@ Header Files\Threads - - Header Files\Threads - Header Files\Encoders @@ -791,5 +785,8 @@ {72c665f5-e6cf-4c48-8b3b-0f02369ee33e} + + {574b856b-cea0-4c37-ba58-17f15f7911da} + \ No newline at end of file diff --git a/src/Config.h b/src/Config.h index 29fdd788..1b683ebd 100644 --- a/src/Config.h +++ b/src/Config.h @@ -34,7 +34,7 @@ #define VER_LAMEXP_MINOR_LO 9 #define VER_LAMEXP_TYPE Alpha #define VER_LAMEXP_PATCH 1 -#define VER_LAMEXP_BUILD 1367 +#define VER_LAMEXP_BUILD 1368 #define VER_LAMEXP_CONFG 1348 /////////////////////////////////////////////////////////////////////////////// diff --git a/src/Thread_FileAnalyzer_ST.cpp b/src/Thread_FileAnalyzer_ST.cpp deleted file mode 100644 index 60e5600e..00000000 --- a/src/Thread_FileAnalyzer_ST.cpp +++ /dev/null @@ -1,826 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// LameXP - Audio Encoder Front-End -// Copyright (C) 2004-2013 LoRd_MuldeR -// -// 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 -/////////////////////////////////////////////////////////////////////////////// - -// -------------------------------------------------------------------- -// !!! THIS IS THE OLD SINGLE-THREADED VERSION OF THE FILE ANALYZER !!! -// -------------------------------------------------------------------- - -#include "Thread_FileAnalyzer_ST.h" - -#include "Global.h" -#include "LockedFile.h" -#include "Model_AudioFile.h" -#include "PlaylistImporter.h" - -#include -#include -#include -#include -#include -#include -#include - -#include - -#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 -//////////////////////////////////////////////////////////// - -FileAnalyzer_ST::FileAnalyzer_ST(const QStringList &inputFiles) -: - m_inputFiles(inputFiles), - m_mediaInfoBin(lamexp_lookup_tool("mediainfo.exe")), - m_avs2wavBin(lamexp_lookup_tool("avs2wav.exe")), - m_templateFile(NULL), - m_abortFlag(false) -{ - m_bSuccess = 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_ST::~FileAnalyzer_ST(void) -{ - if(m_templateFile) - { - QString templatePath = m_templateFile->filePath(); - LAMEXP_DELETE(m_templateFile); - if(QFile::exists(templatePath)) QFile::remove(templatePath); - } -} - -//////////////////////////////////////////////////////////// -// Static data -//////////////////////////////////////////////////////////// - -const char *FileAnalyzer_ST::g_tags_gen[] = -{ - "ID", - "Format", - "Format_Profile", - "Format_Version", - "Duration", - "Title", "Track", - "Track/Position", - "Artist", "Performer", - "Album", - "Genre", - "Released_Date", "Recorded_Date", - "Comment", - "Cover", - "Cover_Type", - "Cover_Mime", - "Cover_Data", - NULL -}; - -const char *FileAnalyzer_ST::g_tags_aud[] = -{ - "ID", - "Source", - "Format", - "Format_Profile", - "Format_Version", - "Channel(s)", - "SamplingRate", - "BitDepth", - "BitRate", - "BitRate_Mode", - NULL -}; - -//////////////////////////////////////////////////////////// -// Thread Main -//////////////////////////////////////////////////////////// - -void FileAnalyzer_ST::run() -{ - m_bSuccess = false; - m_bAborted = false; - - m_filesAccepted = 0; - m_filesRejected = 0; - m_filesDenied = 0; - m_filesDummyCDDA = 0; - m_filesCueSheet = 0; - - lamexp_natural_string_sort(m_inputFiles); // .sort() - - m_recentlyAdded.clear(); - m_abortFlag = false; - - if(!m_templateFile) - { - if(!createTemplate()) - { - qWarning("Failed to create template file!"); - return; - } - } - - while(!m_inputFiles.isEmpty()) - { - int fileType = fileTypeNormal; - QString currentFile = QDir::fromNativeSeparators(m_inputFiles.takeFirst()); - qDebug("Analyzing: %s", currentFile.toUtf8().constData()); - emit fileSelected(QFileInfo(currentFile).fileName()); - AudioFileModel file = analyzeFile(currentFile, &fileType); - - if(m_abortFlag) - { - MessageBeep(MB_ICONERROR); - m_bAborted = true; - qWarning("Operation cancelled by user!"); - 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"); - m_bSuccess = true; -} - -//////////////////////////////////////////////////////////// -// Privtae Functions -//////////////////////////////////////////////////////////// - -const AudioFileModel FileAnalyzer_ST::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_ST::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_ST::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_ST::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_ST::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_ST::createTemplate(void) -{ - if(m_templateFile) - { - qWarning("Template file already exists!"); - return true; - } - - QString templatePath = QString("%1/%2.txt").arg(lamexp_temp_folder2(), lamexp_rand_str()); - - QFile templateFile(templatePath); - if(!templateFile.open(QIODevice::WriteOnly)) - { - return false; - } - - templateFile.write("General;"); - for(size_t i = 0; g_tags_gen[i]; i++) - { - templateFile.write(QString("Gen_%1=%%1%\\n").arg(g_tags_gen[i]).toLatin1().constData()); - } - templateFile.write("\\n\r\n"); - - templateFile.write("Audio;"); - for(size_t i = 0; g_tags_aud[i]; i++) - { - templateFile.write(QString("Aud_%1=%%1%\\n").arg(g_tags_aud[i]).toLatin1().constData()); - } - templateFile.write("\\n\r\n"); - - bool success = (templateFile.error() == QFile::NoError); - templateFile.close(); - - if(!success) - { - QFile::remove(templatePath); - return false; - } - - try - { - m_templateFile = new LockedFile(templatePath); - } - catch(...) - { - qWarning("Failed to lock template file!"); - return false; - } - - return true; -} - -unsigned int FileAnalyzer_ST::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_ST::parseDuration(const QString &str) -{ - bool ok = false; - unsigned int value = str.toUInt(&ok); - return ok ? (value/1000) : 0; -} - -//////////////////////////////////////////////////////////// -// Public Functions -//////////////////////////////////////////////////////////// - -unsigned int FileAnalyzer_ST::filesAccepted(void) -{ - return m_filesAccepted; -} - -unsigned int FileAnalyzer_ST::filesRejected(void) -{ - return m_filesRejected; -} - -unsigned int FileAnalyzer_ST::filesDenied(void) -{ - return m_filesDenied; -} - -unsigned int FileAnalyzer_ST::filesDummyCDDA(void) -{ - return m_filesDummyCDDA; -} - -unsigned int FileAnalyzer_ST::filesCueSheet(void) -{ - return m_filesCueSheet; -} - -//////////////////////////////////////////////////////////// -// EVENTS -//////////////////////////////////////////////////////////// - -/*NONE*/ diff --git a/src/Thread_FileAnalyzer_ST.h b/src/Thread_FileAnalyzer_ST.h deleted file mode 100644 index 8c5ef6c4..00000000 --- a/src/Thread_FileAnalyzer_ST.h +++ /dev/null @@ -1,107 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// LameXP - Audio Encoder Front-End -// Copyright (C) 2004-2013 LoRd_MuldeR -// -// 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 -/////////////////////////////////////////////////////////////////////////////// - -// -------------------------------------------------------------------- -// !!! THIS IS THE OLD SINGLE-THREADED VERSION OF THE FILE ANALYZER !!! -// -------------------------------------------------------------------- - -#pragma once - -#include -#include - -class AudioFileModel; -class QFile; -class QDir; -class QFileInfo; -class LockedFile; - -//////////////////////////////////////////////////////////// -// Splash Thread -//////////////////////////////////////////////////////////// - -class FileAnalyzer_ST: public QThread -{ - Q_OBJECT - -public: - FileAnalyzer_ST(const QStringList &inputFiles); - ~FileAnalyzer_ST(void); - void run(); - bool getSuccess(void) { return !isRunning() && m_bSuccess; } - unsigned int filesAccepted(void); - unsigned int filesRejected(void); - unsigned int filesDenied(void); - unsigned int filesDummyCDDA(void); - unsigned int filesCueSheet(void); - -signals: - void fileSelected(const QString &fileName); - void fileAnalyzed(const AudioFileModel &file); - -public slots: - void abortProcess(void) { m_abortFlag = true; } - -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); - bool createTemplate(void); - - const QString m_mediaInfoBin; - const QString m_avs2wavBin; - - 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; - - volatile bool m_abortFlag; - - static const char *g_tags_gen[]; - static const char *g_tags_aud[]; - - bool m_bAborted; - bool m_bSuccess; -};