From 59f8144c50765189594d5932fc25869f9ea6e265 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Sat, 19 Oct 2013 18:19:03 +0200 Subject: *: use nullptr instead of NULL --- src/DecoderControl.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/DecoderControl.cxx') diff --git a/src/DecoderControl.cxx b/src/DecoderControl.cxx index 330c791dd..26751855d 100644 --- a/src/DecoderControl.cxx +++ b/src/DecoderControl.cxx @@ -38,7 +38,7 @@ decoder_control::~decoder_control() { ClearError(); - if (song != NULL) + if (song != nullptr) song->Free(); g_free(mixramp_start); @@ -49,7 +49,7 @@ decoder_control::~decoder_control() bool decoder_control::IsCurrentSong(const Song *_song) const { - assert(_song != NULL); + assert(_song != nullptr); switch (state) { case DecoderState::STOP: @@ -70,7 +70,7 @@ decoder_control::Start(Song *_song, unsigned _start_ms, unsigned _end_ms, MusicBuffer &_buffer, MusicPipe &_pipe) { - assert(_song != NULL); + assert(_song != nullptr); assert(_pipe.IsEmpty()); if (song != nullptr) -- cgit v1.2.3