reapplied previous patch

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

4 files changed, 15 insertions, 15 deletions

diff --git a/src/plugins/Input/mad/decoder_mad.cpp b/src/plugins/Input/mad/decoder_mad.cpp
index d36239911..42f7873ae 100644
--- a/src/plugins/Input/mad/decoder_mad.cpp
+++ b/src/plugins/Input/mad/decoder_mad.cpp
@@ -60,7 +60,7 @@ bool DecoderMAD::initialize()
     if (!input())
     {
         qWarning("DecoderMAD: cannot initialize.  No input.");
-        return FALSE;
+        return false;
     }
 
     if (!m_input_buf)
@@ -71,7 +71,7 @@ bool DecoderMAD::initialize()
         if (!input()->open(QIODevice::ReadOnly))
         {
             qWarning("DecoderMAD: %s", qPrintable(input()->errorString ()));
-            return FALSE;
+            return false;
         }
     }
 
@@ -89,7 +89,7 @@ bool DecoderMAD::initialize()
     if (!findHeader())
     {
         qDebug("DecoderMAD: Can't find a valid MPEG header.");
-        return FALSE;
+        return false;
     }
     mad_stream_buffer(&stream, (unsigned char *) m_input_buf, m_input_bytes);
     stream.error = MAD_ERROR_BUFLEN;
@@ -111,7 +111,7 @@ void DecoderMAD::deinit()
     mad_frame_finish(&frame);
     mad_stream_finish(&stream);
 
-    m_inited = FALSE;
+    m_inited = false;
     m_totalTime = 0;
     m_channels = 0;
     m_bitrate = 0;
@@ -184,10 +184,10 @@ fail:
 
 bool DecoderMAD::findHeader()
 {
-    bool result = FALSE;
+    bool result = false;
     int count = 0;
-    bool has_xing = FALSE;
-    bool is_vbr = FALSE;
+    bool has_xing = false;
+    bool is_vbr = false;
     mad_timer_t duration = mad_timer_zero;
     struct mad_header header;
     mad_header_init (&header);
@@ -277,7 +277,7 @@ bool DecoderMAD::findHeader()
     }
 
     if (!result)
-        return FALSE;
+        return false;
 
     if (!is_vbr && !input()->isSequential())
     {
@@ -385,12 +385,12 @@ bool DecoderMAD::fillBuffer()
     if (!len)
     {
         qDebug("DecoderMAD: end of file");
-        return FALSE;
+        return false;
     }
     else if(len < 0)
     {
         qWarning("DecoderMAD: error");
-        return FALSE;
+        return false;
     }
     m_input_bytes += len;
     mad_stream_buffer(&stream, (unsigned char *) m_input_buf, m_input_bytes);
diff --git a/src/plugins/Input/mad/decodermadfactory.cpp b/src/plugins/Input/mad/decodermadfactory.cpp
index e58a80ff5..3e38cb4b0 100644
--- a/src/plugins/Input/mad/decodermadfactory.cpp
+++ b/src/plugins/Input/mad/decodermadfactory.cpp
@@ -55,7 +55,7 @@ bool DecoderMADFactory::supports(const QString &source) const
             return true;
         }
     }
-    return FALSE;
+    return false;
 }
 
 bool DecoderMADFactory::canDecode(QIODevice *input) const
@@ -76,9 +76,9 @@ bool DecoderMADFactory::canDecode(QIODevice *input) const
         while ((dec_res = mad_header_decode(&header, &stream)) == -1
                 && MAD_RECOVERABLE(stream.error))
             ;
-        return dec_res != -1 ? true: FALSE;
+        return dec_res != -1 ? true: false;
     }
-    return FALSE;
+    return false;
 }
 
 const DecoderProperties DecoderMADFactory::properties() const
diff --git a/src/plugins/Input/mad/mpegmetadatamodel.cpp b/src/plugins/Input/mad/mpegmetadatamodel.cpp
index b8dc260ee..32eef53e4 100644
--- a/src/plugins/Input/mad/mpegmetadatamodel.cpp
+++ b/src/plugins/Input/mad/mpegmetadatamodel.cpp
@@ -338,7 +338,7 @@ void MpegFileTagModel::remove()
 void MpegFileTagModel::save()
 {
     if(m_tag)
-        m_file->save(m_tagType, FALSE);
+        m_file->save(m_tagType, false);
     else
         m_file->strip(m_tagType);
 }
diff --git a/src/plugins/Input/mad/tagextractor.cpp b/src/plugins/Input/mad/tagextractor.cpp
index b771560b3..ee433a53f 100644
--- a/src/plugins/Input/mad/tagextractor.cpp
+++ b/src/plugins/Input/mad/tagextractor.cpp
@@ -58,7 +58,7 @@ const QMap<Qmmp::MetaData, QString> TagExtractor::id3v2tag()
     QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
     settings.beginGroup("MAD");
     QByteArray name = settings.value("ID3v2_encoding","UTF-8").toByteArray ();
-    bool utf = FALSE;
+    bool utf = false;
     QTextCodec *codec = 0;
     if (name.contains("UTF"))
     {