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

Improved mpg123 file type detection. Before MPEG "Version 2.5" was not detected.

Browse Source
This commit is contained in:
LoRd_MuldeR 2017-04-22 16:00:23 +02:00
parent d8c0aa2c8e
commit 70c3237163
3 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Config.h
View File

@ -35,7 +35,7 @@
#define VER_LAMEXP_MINOR_LO 5 #define VER_LAMEXP_MINOR_LO 5
#define VER_LAMEXP_TYPE Beta #define VER_LAMEXP_TYPE Beta
#define VER_LAMEXP_PATCH 5 #define VER_LAMEXP_PATCH 5
#define VER_LAMEXP_BUILD 1984 #define VER_LAMEXP_BUILD 1985
#define VER_LAMEXP_CONFG 1934 #define VER_LAMEXP_CONFG 1934
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////

21
src/Decoder_MP3.cpp
View File

@ -33,6 +33,11 @@
#include <QDir> #include <QDir>
#include <QProcess> #include <QProcess>
#include <QRegExp> #include <QRegExp>
#include <QMutexLocker>
//Static
QScopedPointer<QRegExp> MP3Decoder::m_regxLayer, MP3Decoder::m_regxVersion;
QMutex MP3Decoder::m_regexMutex;
MP3Decoder::MP3Decoder(void) MP3Decoder::MP3Decoder(void)
: :
@ -134,16 +139,20 @@ bool MP3Decoder::decode(const QString &sourceFile, const QString &outputFile, QA
bool MP3Decoder::isFormatSupported(const QString &containerType, const QString &containerProfile, const QString &formatType, const QString &formatProfile, const QString &formatVersion) bool MP3Decoder::isFormatSupported(const QString &containerType, const QString &containerProfile, const QString &formatType, const QString &formatProfile, const QString &formatVersion)
{ {
if(containerType.compare("MPEG Audio", Qt::CaseInsensitive) == 0 || containerType.compare("Wave", Qt::CaseInsensitive) == 0) const QLatin1String mpegAudio("MPEG Audio"), waveAudio("Wave");
if(containerType.compare(mpegAudio, Qt::CaseInsensitive) == 0) || (containerType.compare(waveAudio, Qt::CaseInsensitive) == 0))
{ {
if(formatType.compare("MPEG Audio", Qt::CaseInsensitive) == 0) if((formatType.compare(mpegAudio, Qt::CaseInsensitive) == 0)
{ {
if(formatProfile.compare("Layer 3", Qt::CaseInsensitive) == 0 || formatProfile.compare("Layer 2", Qt::CaseInsensitive) == 0) QMutexLocker lock(&m_regexMutex);
if (m_regxLayer.isNull() || m_regxVersion.isNull())
{ {
if(formatVersion.compare("Version 1", Qt::CaseInsensitive) == 0 || formatVersion.compare("Version 2", Qt::CaseInsensitive) == 0) m_regxLayer.reset(new QRegExp("\\bLayer\\s+(1|2|3)\\b", Qt::CaseInsensitive));
{ m_regxVersion.reset(new QRegExp("\\bVersion\\s+(1|2|2\\.5)\\b", Qt::CaseInsensitive));
return true;
} }
if (m_regxLayer->indexIn(formatProfile) >= 0)
{
return (m_regxVersion->indexIn(formatVersion) >= 0);
} }
} }
} }

2
src/Decoder_MP3.h
View File

@ -36,4 +36,6 @@ public:
private: private:
const QString m_binary; const QString m_binary;
static QScopedPointer<QRegExp> m_regxLayer, m_regxVersion;
static QMutex m_regexMutex;
}; };