reapplied previous patch

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@1620 90c681e8-e032-0410-971d-27865f9a5e38

3 files changed, 9 insertions, 9 deletions

diff --git a/src/plugins/Input/aac/aacfile.cpp b/src/plugins/Input/aac/aacfile.cpp
index 032945d26..6d1a67f48 100644
--- a/src/plugins/Input/aac/aacfile.cpp
+++ b/src/plugins/Input/aac/aacfile.cpp
@@ -33,7 +33,7 @@ static int adts_sample_rates[] = {96000,88200,64000,48000,44100,32000,24000,2205
 
 AACFile::AACFile(QIODevice *i, bool metaData)
 {
-    m_isValid = FALSE;
+    m_isValid = false;
     m_length = 0;
     m_bitrate = 0;
     m_samplerate = 0;
diff --git a/src/plugins/Input/aac/decoder_aac.cpp b/src/plugins/Input/aac/decoder_aac.cpp
index 1b5fe510a..f78a54576 100644
--- a/src/plugins/Input/aac/decoder_aac.cpp
+++ b/src/plugins/Input/aac/decoder_aac.cpp
@@ -68,7 +68,7 @@ bool DecoderAAC::initialize()
     if (!input())
     {
         qWarning("DecoderAAC: cannot initialize.  No input.");
-        return FALSE;
+        return false;
     }
     if (!m_input_buf)
         m_input_buf = new char[AAC_BUFFER_SIZE];
@@ -79,14 +79,14 @@ bool DecoderAAC::initialize()
         if (!input()->open(QIODevice::ReadOnly))
         {
             qWarning("DecoderAAC: %s", qPrintable(input()->errorString ()));
-            return FALSE;
+            return false;
         }
     }
     AACFile aac_file(input());
     if (!aac_file.isValid())
     {
         qWarning("DecoderAAC: unsupported AAC file");
-        return FALSE;
+        return false;
     }
     m_totalTime = aac_file.length() * 1000;
     m_bitrate = aac_file.bitrate();
@@ -132,12 +132,12 @@ bool DecoderAAC::initialize()
     if (res < 0)
     {
         qWarning("DecoderAAC: NeAACDecInit() failed");
-        return FALSE;
+        return false;
     }
     if (!freq || !chan)
     {
         qWarning("DecoderAAC: invalid sound parameters");
-        return FALSE;
+        return false;
     }
 
     memmove(m_input_buf, m_input_buf + res, m_input_at - res);
@@ -152,7 +152,7 @@ qint64 DecoderAAC::read(char *audio, qint64 maxSize)
     NeAACDecFrameInfo frame_info;
     qint64 size = 0, to_read, read;
     void *out = 0;
-    bool eof = FALSE;
+    bool eof = false;
 
     while (size <= 0 && !eof)
     {
diff --git a/src/plugins/Input/aac/decoderaacfactory.cpp b/src/plugins/Input/aac/decoderaacfactory.cpp
index 72307450c..bce1e2f51 100644
--- a/src/plugins/Input/aac/decoderaacfactory.cpp
+++ b/src/plugins/Input/aac/decoderaacfactory.cpp
@@ -36,7 +36,7 @@ bool DecoderAACFactory::supports(const QString &source) const
 
 bool DecoderAACFactory::canDecode(QIODevice *) const
 {
-    return FALSE;
+    return false;
 }
 
 const DecoderProperties DecoderAACFactory::properties() const
@@ -48,7 +48,7 @@ const DecoderProperties DecoderAACFactory::properties() const
     //properties.contentType = ;
     properties.shortName = "aac";
     properties.hasAbout = true;
-    properties.hasSettings = FALSE;
+    properties.hasSettings = false;
     return properties;
 }