diff options
| author | Max Kellermann <max@duempel.org> | 2012-10-02 10:56:44 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2012-10-02 10:59:56 +0200 |
| commit | cbdd042adc8131c4ef890195447760d229eb1f87 (patch) | |
| tree | f32b528e955b7bdf468168b8c490052bd33a702a /src/decoder/FLACCommon.cxx | |
| parent | a9419da09c27986708002fcb6a9032371eb1ce2b (diff) | |
| download | mpd-cbdd042adc8131c4ef890195447760d229eb1f87.tar.gz mpd-cbdd042adc8131c4ef890195447760d229eb1f87.tar.xz mpd-cbdd042adc8131c4ef890195447760d229eb1f87.zip | |
decoder/flac: use C++ compiler
Diffstat (limited to '')
| -rw-r--r-- | src/decoder/FLACCommon.cxx (renamed from src/decoder/flac_common.c) | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/src/decoder/flac_common.c b/src/decoder/FLACCommon.cxx index 1508ac123..8e86b6ae4 100644 --- a/src/decoder/flac_common.c +++ b/src/decoder/FLACCommon.cxx @@ -1,5 +1,5 @@ /* - * Copyright (C) 2003-2011 The Music Player Daemon Project + * Copyright (C) 2003-2012 The Music Player Daemon Project * http://www.musicpd.org * * This program is free software; you can redistribute it and/or modify @@ -22,10 +22,13 @@ */ #include "config.h" -#include "flac_common.h" -#include "flac_metadata.h" -#include "flac_pcm.h" +#include "FLACCommon.hxx" +#include "FLACMetaData.hxx" +#include "FLAC_PCM.hxx" + +extern "C" { #include "audio_check.h" +} #include <glib.h> @@ -46,7 +49,7 @@ flac_data_init(struct flac_data *data, struct decoder * decoder, data->position = 0; data->decoder = decoder; data->input_stream = input_stream; - data->tag = NULL; + data->tag = nullptr; } void @@ -54,7 +57,7 @@ flac_data_deinit(struct flac_data *data) { pcm_buffer_deinit(&data->buffer); - if (data->tag != NULL) + if (data->tag != nullptr) tag_free(data->tag); } @@ -86,7 +89,7 @@ flac_got_stream_info(struct flac_data *data, if (data->initialized || data->unsupported) return; - GError *error = NULL; + GError *error = nullptr; if (!audio_format_init_checked(&data->audio_format, stream_info->sample_rate, flac_sample_format(stream_info->bits_per_sample), @@ -129,8 +132,8 @@ void flac_metadata_common_cb(const FLAC__StreamMetadata * block, decoder_mixramp(data->decoder, replay_gain_db, mixramp_start, mixramp_end); - if (data->tag != NULL) - flac_vorbis_comments_to_tag(data->tag, NULL, + if (data->tag != nullptr) + flac_vorbis_comments_to_tag(data->tag, nullptr, &block->data.vorbis_comment); default: @@ -160,7 +163,7 @@ flac_got_first_frame(struct flac_data *data, const FLAC__FrameHeader *header) if (data->unsupported) return false; - GError *error = NULL; + GError *error = nullptr; if (!audio_format_init_checked(&data->audio_format, header->sample_rate, flac_sample_format(header->bits_per_sample), @@ -199,7 +202,7 @@ flac_common_write(struct flac_data *data, const FLAC__Frame * frame, buffer = pcm_buffer_get(&data->buffer, buffer_size); flac_convert(buffer, frame->header.channels, - data->audio_format.format, buf, + (enum sample_format)data->audio_format.format, buf, 0, frame->header.blocksize); if (nbytes > 0) |