diff options
| author | Max Kellermann <max@duempel.org> | 2013-10-28 23:58:17 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2013-10-28 23:58:17 +0100 |
| commit | 20597b3632d3b6e25ba532716106f90d5b64d0e8 (patch) | |
| tree | fa6dabaff127150caf3cf4723257f15ef2c3e0f8 /src/decoder/VorbisDecoderPlugin.cxx | |
| parent | 4728735acf20fba24d0d03ab431160e250325869 (diff) | |
| download | mpd-20597b3632d3b6e25ba532716106f90d5b64d0e8.tar.gz mpd-20597b3632d3b6e25ba532716106f90d5b64d0e8.tar.xz mpd-20597b3632d3b6e25ba532716106f90d5b64d0e8.zip | |
*: use nullptr instead of NULL
Diffstat (limited to 'src/decoder/VorbisDecoderPlugin.cxx')
| -rw-r--r-- | src/decoder/VorbisDecoderPlugin.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/decoder/VorbisDecoderPlugin.cxx b/src/decoder/VorbisDecoderPlugin.cxx index 8e59afe3b..075e3c730 100644 --- a/src/decoder/VorbisDecoderPlugin.cxx +++ b/src/decoder/VorbisDecoderPlugin.cxx @@ -133,9 +133,9 @@ vorbis_is_open(struct vorbis_input_stream *vis, OggVorbis_File *vf, vis->input_stream = &input_stream; vis->seekable = input_stream.CheapSeeking(); - int ret = ov_open_callbacks(vis, vf, NULL, 0, vorbis_is_callbacks); + int ret = ov_open_callbacks(vis, vf, nullptr, 0, vorbis_is_callbacks); if (ret < 0) { - if (decoder == NULL || + if (decoder == nullptr || decoder_get_command(*decoder) == DecoderCommand::NONE) FormatWarning(vorbis_domain, "Failed to open Ogg Vorbis stream: %s", @@ -191,7 +191,7 @@ vorbis_stream_decode(Decoder &decoder, return; const vorbis_info *vi = ov_info(&vf, -1); - if (vi == NULL) { + if (vi == nullptr) { LogWarning(vorbis_domain, "ov_info() has failed"); return; } @@ -265,7 +265,7 @@ vorbis_stream_decode(Decoder &decoder, if (current_section != prev_section) { vi = ov_info(&vf, -1); - if (vi == NULL) { + if (vi == nullptr) { LogWarning(vorbis_domain, "ov_info() has failed"); break; @@ -309,7 +309,7 @@ vorbis_scan_stream(InputStream &is, struct vorbis_input_stream vis; OggVorbis_File vf; - if (!vorbis_is_open(&vis, &vf, NULL, is)) + if (!vorbis_is_open(&vis, &vf, nullptr, is)) return false; tag_handler_invoke_duration(handler, handler_ctx, @@ -323,7 +323,7 @@ vorbis_scan_stream(InputStream &is, } static const char *const vorbis_suffixes[] = { - "ogg", "oga", NULL + "ogg", "oga", nullptr }; static const char *const vorbis_mime_types[] = { @@ -335,7 +335,7 @@ static const char *const vorbis_mime_types[] = { "audio/x-ogg", "audio/x-vorbis", "audio/x-vorbis+ogg", - NULL + nullptr }; const struct DecoderPlugin vorbis_decoder_plugin = { |