reapplied previous patch

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

9 files changed, 27 insertions, 27 deletions

diff --git a/src/plugins/Output/alsa/outputalsa.cpp b/src/plugins/Output/alsa/outputalsa.cpp
index 98c9bb8a8..620d758b2 100644
--- a/src/plugins/Output/alsa/outputalsa.cpp
+++ b/src/plugins/Output/alsa/outputalsa.cpp
@@ -37,18 +37,18 @@
 #include "outputalsa.h"
 
 OutputALSA::OutputALSA(QObject * parent)
-        : Output(parent), m_inited(FALSE)
+        : Output(parent), m_inited(false)
 {
     QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
     QString dev_name = settings.value("ALSA/device","default").toString();
-    m_use_mmap = settings.value("ALSA/use_mmap", FALSE).toBool();
+    m_use_mmap = settings.value("ALSA/use_mmap", false).toBool();
     pcm_name = strdup(dev_name.toAscii().data());
     pcm_handle = 0;
     m_prebuf = 0;
     m_prebuf_size = 0;
     m_prebuf_fill = 0;
-    m_pause = FALSE;
-    m_can_pause = FALSE;
+    m_pause = false;
+    m_can_pause = false;
 }
 
 OutputALSA::~OutputALSA()
@@ -69,7 +69,7 @@ void OutputALSA::configure(quint32 freq, int chan, Qmmp::AudioFormat format)
     settings.beginGroup("ALSA");
     uint buffer_time = settings.value("buffer_time",500).toUInt()*1000;
     uint period_time = settings.value("period_time",100).toUInt()*1000;
-    bool use_pause =  settings.value("use_snd_pcm_pause", FALSE).toBool();
+    bool use_pause =  settings.value("use_snd_pcm_pause", false).toBool();
     settings.endGroup();
 
     snd_pcm_hw_params_t *hwparams = 0;
@@ -88,7 +88,7 @@ void OutputALSA::configure(quint32 freq, int chan, Qmmp::AudioFormat format)
         if ((err = snd_pcm_hw_params_set_access(pcm_handle, hwparams, SND_PCM_ACCESS_MMAP_INTERLEAVED)) < 0)
         {
             qWarning("OutputALSA: Error setting mmap access: %s", snd_strerror(err));
-            m_use_mmap = FALSE;
+            m_use_mmap = false;
         }
     }
     if (!m_use_mmap)
@@ -207,15 +207,15 @@ void OutputALSA::reset()
 
 bool OutputALSA::initialize()
 {
-    m_inited = FALSE;
+    m_inited = false;
 
     if (pcm_handle)
-        return FALSE;
+        return false;
 
     if (snd_pcm_open(&pcm_handle, pcm_name, SND_PCM_STREAM_PLAYBACK, SND_PCM_NONBLOCK) < 0)
     {
         qWarning ("OutputALSA: Error opening PCM device %s", pcm_name);
-        return FALSE;
+        return false;
     }
 
     m_inited = true;
@@ -358,7 +358,7 @@ void OutputALSA::uninitialize()
 {
     if (!m_inited)
         return;
-    m_inited = FALSE;
+    m_inited = false;
     if (pcm_handle)
     {
         snd_pcm_drop(pcm_handle);
diff --git a/src/plugins/Output/alsa/settingsdialog.cpp b/src/plugins/Output/alsa/settingsdialog.cpp
index 86001bfe3..5bcaaccf0 100644
--- a/src/plugins/Output/alsa/settingsdialog.cpp
+++ b/src/plugins/Output/alsa/settingsdialog.cpp
@@ -55,8 +55,8 @@ SettingsDialog::SettingsDialog ( QWidget *parent )
     if (d >= 0)
         ui.mixerDeviceComboBox->setCurrentIndex(d);
 
-    ui.mmapCheckBox->setChecked(settings.value("use_mmap", FALSE).toBool());
-    ui.pauseCheckBox->setChecked(settings.value("use_snd_pcm_pause", FALSE).toBool());
+    ui.mmapCheckBox->setChecked(settings.value("use_mmap", false).toBool());
+    ui.pauseCheckBox->setChecked(settings.value("use_snd_pcm_pause", false).toBool());
     settings.endGroup();
 }
 
diff --git a/src/plugins/Output/jack/outputjack.cpp b/src/plugins/Output/jack/outputjack.cpp
index 8f6cd272e..45807e4a1 100644
--- a/src/plugins/Output/jack/outputjack.cpp
+++ b/src/plugins/Output/jack/outputjack.cpp
@@ -32,7 +32,7 @@
 #include <string.h>
 
 OutputJACK::OutputJACK(QObject *parent)
-        : Output(parent), m_inited(FALSE), m_configure(FALSE)
+        : Output(parent), m_inited(false), m_configure(FALSE)
 {
     JACK_Init();
 }
@@ -47,8 +47,8 @@ void OutputJACK::configure(quint32 freq, int chan, Qmmp::AudioFormat format)
     qDebug("OutputJACK: configure");
     if(JACK_Open(&jack_device, AudioParameters::sampleSize(format)*8, (unsigned long *)&freq, chan))
     {
-        m_configure = FALSE;
-        m_inited = FALSE;
+        m_configure = false;
+        m_inited = false;
         return;
     }
     else
@@ -60,8 +60,8 @@ void OutputJACK::configure(quint32 freq, int chan, Qmmp::AudioFormat format)
 
 bool OutputJACK::initialize()
 {
-    m_inited = FALSE;
-    m_configure = FALSE;
+    m_inited = false;
+    m_configure = false;
     jack_options_t options = JackNoStartServer;
     jack_status_t status;
     jack_client_t *client = jack_client_open ("test_qmmp", options, &status, NULL);
@@ -72,7 +72,7 @@ bool OutputJACK::initialize()
         {
             qDebug("Unable to connect to JACK server.");
         }
-        return FALSE;
+        return false;
     }
     jack_client_close (client);
     m_inited = true;
diff --git a/src/plugins/Output/jack/outputjackfactory.cpp b/src/plugins/Output/jack/outputjackfactory.cpp
index 1f988486d..82e21588a 100644
--- a/src/plugins/Output/jack/outputjackfactory.cpp
+++ b/src/plugins/Output/jack/outputjackfactory.cpp
@@ -29,7 +29,7 @@ const OutputProperties OutputJACKFactory::properties() const
     OutputProperties properties;
     properties.name = tr("JACK Plugin");
     properties.hasAbout = true;
-    properties.hasSettings = FALSE;
+    properties.hasSettings = false;
     properties.shortName = "jack";
     return properties;
 }
diff --git a/src/plugins/Output/null/outputnullfactory.cpp b/src/plugins/Output/null/outputnullfactory.cpp
index ea20f9bfe..15ac4ee18 100644
--- a/src/plugins/Output/null/outputnullfactory.cpp
+++ b/src/plugins/Output/null/outputnullfactory.cpp
@@ -29,7 +29,7 @@ const OutputProperties OutputNullFactory::properties() const
     OutputProperties properties;
     properties.name = tr("Null Plugin");
     properties.hasAbout = true;
-    properties.hasSettings = FALSE;
+    properties.hasSettings = false;
     properties.shortName = "null";
     return properties;
 }
diff --git a/src/plugins/Output/oss/outputoss.cpp b/src/plugins/Output/oss/outputoss.cpp
index 860766b39..7125dc981 100644
--- a/src/plugins/Output/oss/outputoss.cpp
+++ b/src/plugins/Output/oss/outputoss.cpp
@@ -64,7 +64,7 @@ OutputOSS* OutputOSS::instance()
 }
 
 OutputOSS::OutputOSS(QObject * parent)
-        : Output(parent), m_inited(FALSE),
+        : Output(parent), m_inited(false),
          m_frequency(-1), m_channels(-1),
         do_select(true),
         m_audio_fd(-1)
@@ -212,7 +212,7 @@ bool OutputOSS::initialize()
 {
     reset();
     if (m_audio_fd < 0)
-        return FALSE;
+        return false;
     m_inited = true;
     return true;
 }
@@ -221,7 +221,7 @@ void OutputOSS::uninitialize()
 {
     if (!m_inited)
         return;
-    m_inited = FALSE;
+    m_inited = false;
     m_frequency = -1;
     m_channels = -1;
     resetDSP();
@@ -283,7 +283,7 @@ VolumeControlOSS::VolumeControlOSS(QObject *parent) : VolumeControl(parent)
 #else
     m_mixer_device = settings.value("OSS/device","/dev/dsp").toString();
     int mixer_fd = -1;
-    bool to_close = FALSE;
+    bool to_close = false;
     if (OutputOSS::instance() && OutputOSS::instance()->audio_fd() > 0)
         mixer_fd = OutputOSS::instance()->audio_fd();
     else
diff --git a/src/plugins/Output/pulseaudio/outputpulseaudiofactory.cpp b/src/plugins/Output/pulseaudio/outputpulseaudiofactory.cpp
index 747b8d180..26326f38f 100644
--- a/src/plugins/Output/pulseaudio/outputpulseaudiofactory.cpp
+++ b/src/plugins/Output/pulseaudio/outputpulseaudiofactory.cpp
@@ -29,7 +29,7 @@ const OutputProperties OutputPulseAudioFactory::properties() const
     OutputProperties properties;
     properties.name = tr("PulseAudio Plugin");
     properties.hasAbout = true;
-    properties.hasSettings = FALSE;
+    properties.hasSettings = false;
     properties.shortName = "pulse";
     return properties;
 }
diff --git a/src/plugins/Output/waveout/outputwaveout.cpp b/src/plugins/Output/waveout/outputwaveout.cpp
index 6fba551d2..90fb19337 100644
--- a/src/plugins/Output/waveout/outputwaveout.cpp
+++ b/src/plugins/Output/waveout/outputwaveout.cpp
@@ -137,7 +137,7 @@ bool OutputWaveOut::initialize()
     if (!waveOutGetNumDevs ())

     {

         qWarning("OutputWaveOut: no audio device found");

-        return FALSE;

+        return false;

     }

 

     return true;

diff --git a/src/plugins/Output/waveout/outputwaveoutfactory.cpp b/src/plugins/Output/waveout/outputwaveoutfactory.cpp
index b2d836c70..a0ad4a847 100644
--- a/src/plugins/Output/waveout/outputwaveoutfactory.cpp
+++ b/src/plugins/Output/waveout/outputwaveoutfactory.cpp
@@ -29,7 +29,7 @@ const OutputProperties OutputWaveOutFactory::properties() const
     OutputProperties properties;

     properties.name = tr("WaveOut Plugin");

     properties.hasAbout = true;

-    properties.hasSettings = FALSE;

+    properties.hasSettings = false;

     properties.shortName = "waveout";

     return properties;

 }