aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2014-07-30 18:44:20 +0200
committerMax Kellermann <max@duempel.org>2014-07-30 18:44:20 +0200
commit37d6cc07a7a09845be53fcd2edf7697375d9a2ff (patch)
treee3a97fad3a227a5b84f7b36c4a37546670ef8a90 /src
parentd79b6cd8dcc3fb96a1e318c9f85ae3ec9944feee (diff)
downloadmpd-37d6cc07a7a09845be53fcd2edf7697375d9a2ff.tar.gz
mpd-37d6cc07a7a09845be53fcd2edf7697375d9a2ff.tar.xz
mpd-37d6cc07a7a09845be53fcd2edf7697375d9a2ff.zip
pcm: use nullptr instead of NULL
Diffstat (limited to 'src')
-rw-r--r--src/pcm/PcmConvert.hxx4
-rw-r--r--src/pcm/PcmDsdUsb.cxx2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/pcm/PcmConvert.hxx b/src/pcm/PcmConvert.hxx
index 7d05b3bb2..c65835421 100644
--- a/src/pcm/PcmConvert.hxx
+++ b/src/pcm/PcmConvert.hxx
@@ -73,9 +73,9 @@ public:
* @param src_size the size of #src in bytes
* @param dest_format the requested destination audio format
* @param dest_size_r returns the number of bytes of the destination buffer
- * @param error_r location to store the error occurring, or NULL to
+ * @param error_r location to store the error occurring, or nullptr to
* ignore errors
- * @return the destination buffer, or NULL on error
+ * @return the destination buffer, or nullptr on error
*/
const void *Convert(const void *src, size_t src_size,
size_t *dest_size_r,
diff --git a/src/pcm/PcmDsdUsb.cxx b/src/pcm/PcmDsdUsb.cxx
index 1bfb4206f..a42b03e64 100644
--- a/src/pcm/PcmDsdUsb.cxx
+++ b/src/pcm/PcmDsdUsb.cxx
@@ -45,7 +45,7 @@ pcm_dsd_to_usb(PcmBuffer &buffer, unsigned channels,
size_t *dest_size_r)
{
assert(audio_valid_channel_count(channels));
- assert(src != NULL);
+ assert(src != nullptr);
assert(src_size > 0);
assert(src_size % channels == 0);