Some code clean-up using new Lazy<T> operator->().
This commit is contained in:
parent
618f9f532b
commit
b18f80596b
@ -34,8 +34,8 @@
|
|||||||
#define VER_LAMEXP_MINOR_HI 1
|
#define VER_LAMEXP_MINOR_HI 1
|
||||||
#define VER_LAMEXP_MINOR_LO 8
|
#define VER_LAMEXP_MINOR_LO 8
|
||||||
#define VER_LAMEXP_TYPE Alpha
|
#define VER_LAMEXP_TYPE Alpha
|
||||||
#define VER_LAMEXP_PATCH 2
|
#define VER_LAMEXP_PATCH 3
|
||||||
#define VER_LAMEXP_BUILD 2196
|
#define VER_LAMEXP_BUILD 2198
|
||||||
#define VER_LAMEXP_CONFG 2188
|
#define VER_LAMEXP_CONFG 2188
|
||||||
|
|
||||||
///////////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////////
|
||||||
|
@ -99,7 +99,7 @@ bool AACDecoder::isFormatSupported(const QString &containerType, const QString &
|
|||||||
if(formatType.compare(QLatin1String("AAC"), Qt::CaseInsensitive) == 0)
|
if(formatType.compare(QLatin1String("AAC"), Qt::CaseInsensitive) == 0)
|
||||||
{
|
{
|
||||||
QMutexLocker lock(&m_regexMutex);
|
QMutexLocker lock(&m_regexMutex);
|
||||||
if ((*m_regxFeatures).indexIn(formatProfile) >= 0)
|
if (m_regxFeatures->indexIn(formatProfile) >= 0)
|
||||||
{
|
{
|
||||||
if((formatVersion.compare(QLatin1String("2"), Qt::CaseInsensitive) == 0) || (formatVersion.compare(QLatin1String("4"), Qt::CaseInsensitive) == 0) || formatVersion.isEmpty())
|
if((formatVersion.compare(QLatin1String("2"), Qt::CaseInsensitive) == 0) || (formatVersion.compare(QLatin1String("4"), Qt::CaseInsensitive) == 0) || formatVersion.isEmpty())
|
||||||
{
|
{
|
||||||
|
@ -110,9 +110,9 @@ bool MP3Decoder::isFormatSupported(const QString &containerType, const QString &
|
|||||||
if(formatType.compare(mpegAudio, Qt::CaseInsensitive) == 0)
|
if(formatType.compare(mpegAudio, Qt::CaseInsensitive) == 0)
|
||||||
{
|
{
|
||||||
QMutexLocker lock(&m_regexMutex);
|
QMutexLocker lock(&m_regexMutex);
|
||||||
if ((*m_regxLayer).indexIn(formatProfile) >= 0)
|
if (m_regxLayer->indexIn(formatProfile) >= 0)
|
||||||
{
|
{
|
||||||
return ((*m_regxVersion).indexIn(formatVersion) >= 0);
|
return (m_regxVersion->indexIn(formatVersion) >= 0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -288,9 +288,9 @@ bool MP3Encoder::isFormatSupported(const QString &containerType, const QString &
|
|||||||
else if (formatType.compare(mpegAudio, Qt::CaseInsensitive) == 0)
|
else if (formatType.compare(mpegAudio, Qt::CaseInsensitive) == 0)
|
||||||
{
|
{
|
||||||
QMutexLocker lock(&m_regexMutex);
|
QMutexLocker lock(&m_regexMutex);
|
||||||
if ((*m_regxLayer).indexIn(formatProfile) >= 0)
|
if (m_regxLayer->indexIn(formatProfile) >= 0)
|
||||||
{
|
{
|
||||||
return ((*m_regxVersion).indexIn(formatVersion) >= 0);
|
return (m_regxVersion->indexIn(formatVersion) >= 0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user