aboutsummaryrefslogtreecommitdiffstats
path: root/src/DecoderControl.cxx
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2013-10-19 18:19:03 +0200
committerMax Kellermann <max@duempel.org>2013-10-19 18:19:03 +0200
commit59f8144c50765189594d5932fc25869f9ea6e265 (patch)
treef460d9f46a99040dea402bcb3ad2d84a0e734285 /src/DecoderControl.cxx
parent5a7c931293b55a27c3f79c6951707a8d6e2a5f6c (diff)
downloadmpd-59f8144c50765189594d5932fc25869f9ea6e265.tar.gz
mpd-59f8144c50765189594d5932fc25869f9ea6e265.tar.xz
mpd-59f8144c50765189594d5932fc25869f9ea6e265.zip
*: use nullptr instead of NULL
Diffstat (limited to 'src/DecoderControl.cxx')
-rw-r--r--src/DecoderControl.cxx6
1 files changed, 3 insertions, 3 deletions
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)