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, 15 insertions, 15 deletions

diff --git a/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp b/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp
index 97dffb244..1d8c9476f 100644
--- a/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp
+++ b/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp
@@ -68,7 +68,7 @@ DecoderFFmpeg::DecoderFFmpeg(const QString &path, QIODevice *i)
         : Decoder(i)
 {
     m_bitrate = 0;
-    m_skip = FALSE;
+    m_skip = false;
     m_totalTime = 0;
     ic = 0;
     m_path = path;
@@ -98,7 +98,7 @@ DecoderFFmpeg::~DecoderFFmpeg()
 bool DecoderFFmpeg::initialize()
 {
     m_bitrate = 0;
-    m_skip = FALSE;
+    m_skip = false;
     m_totalTime = 0;
     m_seekTime = -1;
     av_register_all();
@@ -109,12 +109,12 @@ bool DecoderFFmpeg::initialize()
     pd.buf_size = input()->peek((char*)buf, sizeof(buf) - AVPROBE_PADDING_SIZE);
     pd.buf = buf;
     if(pd.buf_size < 8192)
-        return FALSE;
+        return false;
     AVInputFormat *fmt = av_probe_input_format(&pd, 1);
     if(!fmt)
     {
         qWarning("DecoderFFmpeg: usupported format");
-        return FALSE;
+        return false;
     }
     qDebug("DecoderFFmpeg: detected format: %s", fmt->long_name);
 
@@ -132,7 +132,7 @@ bool DecoderFFmpeg::initialize()
                               fmt, &ap) != 0)
     {
         qDebug("DecoderFFmpeg: av_open_input_stream() failed");
-        return FALSE;
+        return false;
     }
 
     AVCodec *codec;
@@ -160,13 +160,13 @@ bool DecoderFFmpeg::initialize()
     if (!codec)
     {
         qWarning("DecoderFFmpeg: unsupported codec for output stream");
-        return FALSE;
+        return false;
     }
 
     if (avcodec_open(c, codec) < 0)
     {
         qWarning("DecoderFFmpeg: error while opening codec for output stream");
-        return FALSE;
+        return false;
     }
 
     m_totalTime = input()->isSequential() ? 0 : ic->duration * 1000 / AV_TIME_BASE;
@@ -197,7 +197,7 @@ qint64 DecoderFFmpeg::read(char *audio, qint64 maxSize)
         while(m_temp_pkt.size)
             ffmpeg_decode(m_output_buf);
         m_output_at = 0;
-        m_skip = FALSE;
+        m_skip = false;
     }
     if(!m_output_at)
         fillBuffer();
diff --git a/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp b/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp
index 89fb95c88..43477702b 100644
--- a/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp
+++ b/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp
@@ -61,7 +61,7 @@ bool DecoderFFmpegFactory::supports(const QString &source) const
         if (regexp.exactMatch(source))
             return true;
     }
-    return FALSE;
+    return false;
 }
 
 bool DecoderFFmpegFactory::canDecode(QIODevice *i) const
@@ -82,18 +82,18 @@ bool DecoderFFmpegFactory::canDecode(QIODevice *i) const
     pd.buf_size = i->peek((char*)buf, sizeof(buf) - AVPROBE_PADDING_SIZE);
     pd.buf = buf;
     if(pd.buf_size < 8192)
-        return FALSE;
+        return false;
     AVInputFormat *fmt = av_probe_input_format(&pd, 1);
     if(!fmt)
     {
         qWarning("DecoderFFmpegFactory: usupported format");
-        return FALSE;
+        return false;
     }
     if(filters.contains("*.mp3") && !memcmp(fmt->name, "mp3", 3))
         return true;
     if(filters.contains("*.aac") && !memcmp(fmt->name, "aac", 3))
         return true;
-    return FALSE;
+    return false;
 }
 
 const DecoderProperties DecoderFFmpegFactory::properties() const
@@ -122,7 +122,7 @@ const DecoderProperties DecoderFFmpegFactory::properties() const
     properties.shortName = "ffmpeg";
     properties.hasAbout = true;
     properties.hasSettings = true;
-    properties.noInput = FALSE;
+    properties.noInput = false;
     return properties;
 }
 
diff --git a/src/plugins/Input/ffmpeg/settingsdialog.cpp b/src/plugins/Input/ffmpeg/settingsdialog.cpp
index 230dbb295..5044f789e 100644
--- a/src/plugins/Input/ffmpeg/settingsdialog.cpp
+++ b/src/plugins/Input/ffmpeg/settingsdialog.cpp
@@ -66,8 +66,8 @@ SettingsDialog::SettingsDialog(QWidget *parent)
     ui.apeCheckBox->setEnabled(avcodec_find_decoder(CODEC_ID_APE));
     ui.apeCheckBox->setChecked(filters.contains("*.ape") && avcodec_find_decoder(CODEC_ID_APE));
 #else
-    ui.apeCheckBox->setChecked(FALSE);
-    ui.apeCheckBox->setEnabled(FALSE);
+    ui.apeCheckBox->setChecked(false);
+    ui.apeCheckBox->setEnabled(false);
 #endif
     ui.ttaCheckBox->setEnabled(avcodec_find_decoder(CODEC_ID_TTA));
     ui.ttaCheckBox->setChecked(filters.contains("*.tta") && avcodec_find_decoder(CODEC_ID_TTA));