| 修订版 | b18f80596b32127cf910e408a34f61cb34c5c291 (tree) |
|---|---|
| 时间 | 2018-12-08 23:50:28 |
| 作者 |  LoRd_MuldeR <mulder2@gmx....> |
| Commiter | LoRd_MuldeR |
Some code clean-up using new Lazy<T> operator->().
src/Config.h (diff)
src/Decoder_AAC.cpp (diff) src/Decoder_MP3.cpp (diff) src/Encoder_MP3.cpp (diff)| @@ -34,8 +34,8 @@ | ||
| 34 | 34 | #define VER_LAMEXP_MINOR_HI 1 |
| 35 | 35 | #define VER_LAMEXP_MINOR_LO 8 |
| 36 | 36 | #define VER_LAMEXP_TYPE Alpha |
| 37 | -#define VER_LAMEXP_PATCH 2 | |
| 38 | -#define VER_LAMEXP_BUILD 2196 | |
| 37 | +#define VER_LAMEXP_PATCH 3 | |
| 38 | +#define VER_LAMEXP_BUILD 2198 | |
| 39 | 39 | #define VER_LAMEXP_CONFG 2188 |
| 40 | 40 | |
| 41 | 41 | /////////////////////////////////////////////////////////////////////////////// |
| @@ -99,7 +99,7 @@ bool AACDecoder::isFormatSupported(const QString &containerType, const QString & | ||
| 99 | 99 | if(formatType.compare(QLatin1String("AAC"), Qt::CaseInsensitive) == 0) |
| 100 | 100 | { |
| 101 | 101 | QMutexLocker lock(&m_regexMutex); |
| 102 | - if ((*m_regxFeatures).indexIn(formatProfile) >= 0) | |
| 102 | + if (m_regxFeatures->indexIn(formatProfile) >= 0) | |
| 103 | 103 | { |
| 104 | 104 | if((formatVersion.compare(QLatin1String("2"), Qt::CaseInsensitive) == 0) || (formatVersion.compare(QLatin1String("4"), Qt::CaseInsensitive) == 0) || formatVersion.isEmpty()) |
| 105 | 105 | { |
| @@ -110,9 +110,9 @@ bool MP3Decoder::isFormatSupported(const QString &containerType, const QString & | ||
| 110 | 110 | if(formatType.compare(mpegAudio, Qt::CaseInsensitive) == 0) |
| 111 | 111 | { |
| 112 | 112 | QMutexLocker lock(&m_regexMutex); |
| 113 | - if ((*m_regxLayer).indexIn(formatProfile) >= 0) | |
| 113 | + if (m_regxLayer->indexIn(formatProfile) >= 0) | |
| 114 | 114 | { |
| 115 | - return ((*m_regxVersion).indexIn(formatVersion) >= 0); | |
| 115 | + return (m_regxVersion->indexIn(formatVersion) >= 0); | |
| 116 | 116 | } |
| 117 | 117 | } |
| 118 | 118 | } |
| @@ -288,9 +288,9 @@ bool MP3Encoder::isFormatSupported(const QString &containerType, const QString & | ||
| 288 | 288 | else if (formatType.compare(mpegAudio, Qt::CaseInsensitive) == 0) |
| 289 | 289 | { |
| 290 | 290 | QMutexLocker lock(&m_regexMutex); |
| 291 | - if ((*m_regxLayer).indexIn(formatProfile) >= 0) | |
| 291 | + if (m_regxLayer->indexIn(formatProfile) >= 0) | |
| 292 | 292 | { |
| 293 | - return ((*m_regxVersion).indexIn(formatVersion) >= 0); | |
| 293 | + return (m_regxVersion->indexIn(formatVersion) >= 0); | |
| 294 | 294 | } |
| 295 | 295 | } |
| 296 | 296 | } |
LameXP
Fork