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/ReplayGainFilterPlugin.cxx | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/filter/ReplayGainFilterPlugin.cxx') diff --git a/src/filter/ReplayGainFilterPlugin.cxx b/src/filter/ReplayGainFilterPlugin.cxx index d736c910f..be6c7ad2b 100644 --- a/src/filter/ReplayGainFilterPlugin.cxx +++ b/src/filter/ReplayGainFilterPlugin.cxx @@ -22,7 +22,7 @@ #include "FilterPlugin.hxx" #include "FilterInternal.hxx" #include "FilterRegistry.hxx" -#include "audio_format.h" +#include "AudioFormat.hxx" #include "replay_gain_info.h" #include "replay_gain_config.h" #include "MixerControl.hxx" @@ -66,7 +66,7 @@ class ReplayGainFilter final : public Filter { */ unsigned volume; - struct audio_format format; + AudioFormat format; PcmBuffer buffer; @@ -112,7 +112,7 @@ public: */ void Update(); - 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); @@ -159,12 +159,12 @@ replay_gain_filter_init(gcc_unused const struct config_param *param, return new ReplayGainFilter(); } -const audio_format * -ReplayGainFilter::Open(audio_format &af, gcc_unused GError **error_r) +AudioFormat +ReplayGainFilter::Open(AudioFormat &af, gcc_unused GError **error_r) { format = af; - return &format; + return format; } void @@ -196,7 +196,7 @@ ReplayGainFilter::FilterPCM(const void *src, size_t src_size, memcpy(dest, src, src_size); bool success = pcm_volume(dest, src_size, - sample_format(format.format), + format.format, volume); if (!success) { g_set_error(error_r, replay_gain_quark(), 0, -- cgit v1.2.3