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/DecoderInternal.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/DecoderInternal.cxx')
| -rw-r--r-- | src/DecoderInternal.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/DecoderInternal.cxx b/src/DecoderInternal.cxx index 307a3550b..43536686b 100644 --- a/src/DecoderInternal.cxx +++ b/src/DecoderInternal.cxx @@ -64,14 +64,14 @@ decoder_get_chunk(struct decoder *decoder) struct decoder_control *dc = decoder->dc; DecoderCommand cmd; - assert(decoder != NULL); + assert(decoder != nullptr); - if (decoder->chunk != NULL) + if (decoder->chunk != nullptr) return decoder->chunk; do { decoder->chunk = dc->buffer->Allocate(); - if (decoder->chunk != NULL) { + if (decoder->chunk != nullptr) { decoder->chunk->replay_gain_serial = decoder->replay_gain_serial; if (decoder->replay_gain_serial != 0) @@ -86,7 +86,7 @@ decoder_get_chunk(struct decoder *decoder) dc->Unlock(); } while (cmd == DecoderCommand::NONE); - return NULL; + return nullptr; } void @@ -94,13 +94,13 @@ decoder_flush_chunk(struct decoder *decoder) { struct decoder_control *dc = decoder->dc; - assert(decoder != NULL); - assert(decoder->chunk != NULL); + assert(decoder != nullptr); + assert(decoder->chunk != nullptr); if (decoder->chunk->IsEmpty()) dc->buffer->Return(decoder->chunk); else dc->pipe->Push(decoder->chunk); - decoder->chunk = NULL; + decoder->chunk = nullptr; } |