From d1e7b4e38136f9342aad76c685a13adf0e69f869 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Sat, 3 Aug 2013 21:00:50 +0200 Subject: audio_format: convert to C++ --- src/filter/NormalizeFilterPlugin.cxx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/filter/NormalizeFilterPlugin.cxx') diff --git a/src/filter/NormalizeFilterPlugin.cxx b/src/filter/NormalizeFilterPlugin.cxx index f4e2963cc..31bcabd36 100644 --- a/src/filter/NormalizeFilterPlugin.cxx +++ b/src/filter/NormalizeFilterPlugin.cxx @@ -22,7 +22,7 @@ #include "FilterInternal.hxx" #include "FilterRegistry.hxx" #include "pcm/PcmBuffer.hxx" -#include "audio_format.h" +#include "AudioFormat.hxx" #include "AudioCompress/compress.h" #include @@ -34,7 +34,7 @@ class NormalizeFilter final : public Filter { PcmBuffer buffer; public: - virtual const audio_format *Open(audio_format &af, GError **error_r); + virtual AudioFormat Open(AudioFormat &af, GError **error_r) override; virtual void Close(); virtual const void *FilterPCM(const void *src, size_t src_size, size_t *dest_size_r, GError **error_r); @@ -47,14 +47,14 @@ normalize_filter_init(gcc_unused const struct config_param *param, return new NormalizeFilter(); } -const struct audio_format * -NormalizeFilter::Open(audio_format &audio_format, gcc_unused GError **error_r) +AudioFormat +NormalizeFilter::Open(AudioFormat &audio_format, gcc_unused GError **error_r) { - audio_format.format = SAMPLE_FORMAT_S16; + audio_format.format = SampleFormat::S16; compressor = Compressor_new(0); - return &audio_format; + return audio_format; } void -- cgit v1.2.3