From 37d6cc07a7a09845be53fcd2edf7697375d9a2ff Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Wed, 30 Jul 2014 18:44:20 +0200 Subject: pcm: use nullptr instead of NULL --- src/pcm/PcmConvert.hxx | 4 ++-- src/pcm/PcmDsdUsb.cxx | 2 +- 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); -- cgit v1.2.3