diff options
| author | Max Kellermann <max@duempel.org> | 2013-10-19 18:19:03 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2013-10-19 18:19:03 +0200 |
| commit | 59f8144c50765189594d5932fc25869f9ea6e265 (patch) | |
| tree | f460d9f46a99040dea402bcb3ad2d84a0e734285 /src/MixerControl.cxx | |
| parent | 5a7c931293b55a27c3f79c6951707a8d6e2a5f6c (diff) | |
| download | mpd-59f8144c50765189594d5932fc25869f9ea6e265.tar.gz mpd-59f8144c50765189594d5932fc25869f9ea6e265.tar.xz mpd-59f8144c50765189594d5932fc25869f9ea6e265.zip | |
*: use nullptr instead of NULL
Diffstat (limited to 'src/MixerControl.cxx')
| -rw-r--r-- | src/MixerControl.cxx | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/MixerControl.cxx b/src/MixerControl.cxx index 2759f945a..dd4f03543 100644 --- a/src/MixerControl.cxx +++ b/src/MixerControl.cxx @@ -32,11 +32,11 @@ mixer_new(const struct mixer_plugin *plugin, void *ao, { Mixer *mixer; - assert(plugin != NULL); + assert(plugin != nullptr); mixer = plugin->init(ao, param, error); - assert(mixer == NULL || mixer->IsPlugin(*plugin)); + assert(mixer == nullptr || mixer->IsPlugin(*plugin)); return mixer; } @@ -44,8 +44,8 @@ mixer_new(const struct mixer_plugin *plugin, void *ao, void mixer_free(Mixer *mixer) { - assert(mixer != NULL); - assert(mixer->plugin != NULL); + assert(mixer != nullptr); + assert(mixer->plugin != nullptr); /* mixers with the "global" flag set might still be open at this point (see mixer_auto_close()) */ @@ -59,14 +59,14 @@ mixer_open(Mixer *mixer, Error &error) { bool success; - assert(mixer != NULL); - assert(mixer->plugin != NULL); + assert(mixer != nullptr); + assert(mixer->plugin != nullptr); const ScopeLock protect(mixer->mutex); if (mixer->open) success = true; - else if (mixer->plugin->open == NULL) + else if (mixer->plugin->open == nullptr) success = mixer->open = true; else success = mixer->open = mixer->plugin->open(mixer, error); @@ -79,11 +79,11 @@ mixer_open(Mixer *mixer, Error &error) static void mixer_close_internal(Mixer *mixer) { - assert(mixer != NULL); - assert(mixer->plugin != NULL); + assert(mixer != nullptr); + assert(mixer->plugin != nullptr); assert(mixer->open); - if (mixer->plugin->close != NULL) + if (mixer->plugin->close != nullptr) mixer->plugin->close(mixer); mixer->open = false; @@ -92,8 +92,8 @@ mixer_close_internal(Mixer *mixer) void mixer_close(Mixer *mixer) { - assert(mixer != NULL); - assert(mixer->plugin != NULL); + assert(mixer != nullptr); + assert(mixer->plugin != nullptr); const ScopeLock protect(mixer->mutex); @@ -127,7 +127,7 @@ mixer_get_volume(Mixer *mixer, Error &error) { int volume; - assert(mixer != NULL); + assert(mixer != nullptr); if (mixer->plugin->global && !mixer->failed && !mixer_open(mixer, error)) @@ -148,7 +148,7 @@ mixer_get_volume(Mixer *mixer, Error &error) bool mixer_set_volume(Mixer *mixer, unsigned volume, Error &error) { - assert(mixer != NULL); + assert(mixer != nullptr); assert(volume <= 100); if (mixer->plugin->global && !mixer->failed && |