aboutsummaryrefslogtreecommitdiffstats
path: root/src/mixer/PulseMixerPlugin.cxx
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2013-10-28 23:58:17 +0100
committerMax Kellermann <max@duempel.org>2013-10-28 23:58:17 +0100
commit20597b3632d3b6e25ba532716106f90d5b64d0e8 (patch)
treefa6dabaff127150caf3cf4723257f15ef2c3e0f8 /src/mixer/PulseMixerPlugin.cxx
parent4728735acf20fba24d0d03ab431160e250325869 (diff)
downloadmpd-20597b3632d3b6e25ba532716106f90d5b64d0e8.tar.gz
mpd-20597b3632d3b6e25ba532716106f90d5b64d0e8.tar.xz
mpd-20597b3632d3b6e25ba532716106f90d5b64d0e8.zip
*: use nullptr instead of NULL
Diffstat (limited to 'src/mixer/PulseMixerPlugin.cxx')
-rw-r--r--src/mixer/PulseMixerPlugin.cxx16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/mixer/PulseMixerPlugin.cxx b/src/mixer/PulseMixerPlugin.cxx
index 368fd3830..ff10256cb 100644
--- a/src/mixer/PulseMixerPlugin.cxx
+++ b/src/mixer/PulseMixerPlugin.cxx
@@ -75,7 +75,7 @@ pulse_mixer_volume_cb(gcc_unused pa_context *context, const pa_sink_input_info *
if (eol)
return;
- if (i == NULL) {
+ if (i == nullptr) {
pulse_mixer_offline(pm);
return;
}
@@ -92,14 +92,14 @@ pulse_mixer_update(PulseMixer *pm,
{
pa_operation *o;
- assert(context != NULL);
- assert(stream != NULL);
+ assert(context != nullptr);
+ assert(stream != nullptr);
assert(pa_stream_get_state(stream) == PA_STREAM_READY);
o = pa_context_get_sink_input_info(context,
pa_stream_get_index(stream),
pulse_mixer_volume_cb, pm);
- if (o == NULL) {
+ if (o == nullptr) {
FormatError(pulse_mixer_domain,
"pa_context_get_sink_input_info() failed: %s",
pa_strerror(pa_context_errno(context)));
@@ -116,12 +116,12 @@ pulse_mixer_on_connect(gcc_unused PulseMixer *pm,
{
pa_operation *o;
- assert(context != NULL);
+ assert(context != nullptr);
o = pa_context_subscribe(context,
(pa_subscription_mask_t)PA_SUBSCRIPTION_MASK_SINK_INPUT,
- NULL, NULL);
- if (o == NULL) {
+ nullptr, nullptr);
+ if (o == nullptr) {
FormatError(pulse_mixer_domain,
"pa_context_subscribe() failed: %s",
pa_strerror(pa_context_errno(context)));
@@ -150,7 +150,7 @@ pulse_mixer_init(void *ao, gcc_unused const config_param &param,
{
PulseOutput *po = (PulseOutput *)ao;
- if (ao == NULL) {
+ if (ao == nullptr) {
error.Set(pulse_mixer_domain,
"The pulse mixer cannot work without the audio output");
return nullptr;