diff options
| author | Max Kellermann <max@duempel.org> | 2013-10-28 23:58:17 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2013-10-28 23:58:17 +0100 |
| commit | 20597b3632d3b6e25ba532716106f90d5b64d0e8 (patch) | |
| tree | fa6dabaff127150caf3cf4723257f15ef2c3e0f8 /src/filter | |
| parent | 4728735acf20fba24d0d03ab431160e250325869 (diff) | |
| download | mpd-20597b3632d3b6e25ba532716106f90d5b64d0e8.tar.gz mpd-20597b3632d3b6e25ba532716106f90d5b64d0e8.tar.xz mpd-20597b3632d3b6e25ba532716106f90d5b64d0e8.zip | |
*: use nullptr instead of NULL
Diffstat (limited to '')
| -rw-r--r-- | src/filter/ChainFilterPlugin.cxx | 4 | ||||
| -rw-r--r-- | src/filter/ReplayGainFilterPlugin.cxx | 8 | ||||
| -rw-r--r-- | src/filter/ReplayGainFilterPlugin.hxx | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/filter/ChainFilterPlugin.cxx b/src/filter/ChainFilterPlugin.cxx index ab1bfbd12..cb52b86ca 100644 --- a/src/filter/ChainFilterPlugin.cxx +++ b/src/filter/ChainFilterPlugin.cxx @@ -152,8 +152,8 @@ ChainFilter::FilterPCM(const void *src, size_t src_size, into the current one */ src = child.filter->FilterPCM(src, src_size, &src_size, error); - if (src == NULL) - return NULL; + if (src == nullptr) + return nullptr; } /* return the output of the last filter */ diff --git a/src/filter/ReplayGainFilterPlugin.cxx b/src/filter/ReplayGainFilterPlugin.cxx index 4d6173e9b..b2dcde4cc 100644 --- a/src/filter/ReplayGainFilterPlugin.cxx +++ b/src/filter/ReplayGainFilterPlugin.cxx @@ -80,7 +80,7 @@ public: } void SetMixer(Mixer *_mixer, unsigned _base) { - assert(_mixer == NULL || (_base > 0 && _base <= 100)); + assert(_mixer == nullptr || (_base > 0 && _base <= 100)); mixer = _mixer; base = _base; @@ -89,7 +89,7 @@ public: } void SetInfo(const ReplayGainInfo *_info) { - if (_info != NULL) { + if (_info != nullptr) { info = *_info; info.Complete(); } else @@ -137,7 +137,7 @@ ReplayGainFilter::Update() } else volume = PCM_VOLUME_1; - if (mixer != NULL) { + if (mixer != nullptr) { /* update the hardware mixer volume */ unsigned _volume = (volume * base) / PCM_VOLUME_1; @@ -198,7 +198,7 @@ ReplayGainFilter::FilterPCM(const void *src, size_t src_size, volume); if (!success) { error.Set(replay_gain_domain, "pcm_volume() has failed"); - return NULL; + return nullptr; } return dest; diff --git a/src/filter/ReplayGainFilterPlugin.hxx b/src/filter/ReplayGainFilterPlugin.hxx index 74bec22d1..fbd1f2712 100644 --- a/src/filter/ReplayGainFilterPlugin.hxx +++ b/src/filter/ReplayGainFilterPlugin.hxx @@ -28,7 +28,7 @@ class Mixer; /** * Enables or disables the hardware mixer for applying replay gain. * - * @param mixer the hardware mixer, or NULL to fall back to software + * @param mixer the hardware mixer, or nullptr to fall back to software * volume * @param base the base volume level for scale=1.0, between 1 and 100 * (including). @@ -40,7 +40,7 @@ replay_gain_filter_set_mixer(Filter *_filter, Mixer *mixer, /** * Sets a new #replay_gain_info at the beginning of a new song. * - * @param info the new #replay_gain_info value, or NULL if no replay + * @param info the new #replay_gain_info value, or nullptr if no replay * gain data is available for the current song */ void |