Some code clean-up using new Lazy<T> operator->().

diff --git a/src/Config.h b/src/Config.h
index 411bfad..a140bac 100644 (file)
--- a/src/Config.h
+++ b/src/Config.h
@@ -34,8 +34,8 @@
 #define VER_LAMEXP_MINOR_HI                                    1
 #define VER_LAMEXP_MINOR_LO                                    8
 #define VER_LAMEXP_TYPE                                                Alpha
-#define VER_LAMEXP_PATCH                                       2
-#define VER_LAMEXP_BUILD                                       2196
+#define VER_LAMEXP_PATCH                                       3
+#define VER_LAMEXP_BUILD                                       2198
 #define VER_LAMEXP_CONFG                                       2188
 
 ///////////////////////////////////////////////////////////////////////////////

diff --git a/src/Decoder_AAC.cpp b/src/Decoder_AAC.cpp
index da75d47..0727a61 100644 (file)
--- a/src/Decoder_AAC.cpp
+++ b/src/Decoder_AAC.cpp
@@ -99,7 +99,7 @@ bool AACDecoder::isFormatSupported(const QString &containerType, const QString &
                if(formatType.compare(QLatin1String("AAC"), Qt::CaseInsensitive) == 0)
                {
                        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())
                                {

diff --git a/src/Decoder_MP3.cpp b/src/Decoder_MP3.cpp
index 4e47525..5cb30e8 100644 (file)
--- a/src/Decoder_MP3.cpp
+++ b/src/Decoder_MP3.cpp
@@ -110,9 +110,9 @@ bool MP3Decoder::isFormatSupported(const QString &containerType, const QString &
                if(formatType.compare(mpegAudio, Qt::CaseInsensitive) == 0)
                {
                        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);
                        }
                }
        }

diff --git a/src/Encoder_MP3.cpp b/src/Encoder_MP3.cpp
index cfdf6d2..1396698 100644 (file)
--- a/src/Encoder_MP3.cpp
+++ b/src/Encoder_MP3.cpp
@@ -288,9 +288,9 @@ bool MP3Encoder::isFormatSupported(const QString &containerType, const QString &
                else if (formatType.compare(mpegAudio, Qt::CaseInsensitive) == 0)
                {
                        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);
                        }
                }
        }