aboutsummaryrefslogtreecommitdiffstats
path: root/src/MixerAll.cxx
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2013-10-19 18:19:03 +0200
committerMax Kellermann <max@duempel.org>2013-10-19 18:19:03 +0200
commit59f8144c50765189594d5932fc25869f9ea6e265 (patch)
treef460d9f46a99040dea402bcb3ad2d84a0e734285 /src/MixerAll.cxx
parent5a7c931293b55a27c3f79c6951707a8d6e2a5f6c (diff)
downloadmpd-59f8144c50765189594d5932fc25869f9ea6e265.tar.gz
mpd-59f8144c50765189594d5932fc25869f9ea6e265.tar.xz
mpd-59f8144c50765189594d5932fc25869f9ea6e265.zip
*: use nullptr instead of NULL
Diffstat (limited to '')
-rw-r--r--src/MixerAll.cxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/MixerAll.cxx b/src/MixerAll.cxx
index e9994e901..37225fd25 100644
--- a/src/MixerAll.cxx
+++ b/src/MixerAll.cxx
@@ -46,7 +46,7 @@ output_mixer_get_volume(unsigned i)
return -1;
Mixer *mixer = output->mixer;
- if (mixer == NULL)
+ if (mixer == nullptr)
return -1;
Error error;
@@ -93,7 +93,7 @@ output_mixer_set_volume(unsigned i, unsigned volume)
return false;
Mixer *mixer = output->mixer;
- if (mixer == NULL)
+ if (mixer == nullptr)
return false;
Error error;
@@ -133,7 +133,7 @@ output_mixer_get_software_volume(unsigned i)
return -1;
Mixer *mixer = output->mixer;
- if (mixer == NULL || !mixer->IsPlugin(software_mixer_plugin))
+ if (mixer == nullptr || !mixer->IsPlugin(software_mixer_plugin))
return -1;
return mixer_get_volume(mixer, IgnoreError());
@@ -168,7 +168,7 @@ mixer_all_set_software_volume(unsigned volume)
for (unsigned i = 0; i < count; i++) {
struct audio_output *output = audio_output_get(i);
- if (output->mixer != NULL &&
+ if (output->mixer != nullptr &&
output->mixer->plugin == &software_mixer_plugin)
mixer_set_volume(output->mixer, volume, IgnoreError());
}