1 files changed, 16 insertions, 16 deletions

diff --git a/src/filter/ConvertFilterPlugin.cxx b/src/filter/ConvertFilterPlugin.cxx
index 09a2c9848..f98184489 100644
--- a/src/filter/ConvertFilterPlugin.cxx
+++ b/src/filter/ConvertFilterPlugin.cxx
@@ -25,7 +25,7 @@
 #include "conf.h"
 #include "pcm/PcmConvert.hxx"
 #include "util/Manual.hxx"
-#include "audio_format.h"
+#include "AudioFormat.hxx"
 #include "poison.h"
 
 #include <assert.h>
@@ -36,27 +36,27 @@ class ConvertFilter final : public Filter {
 	 * The input audio format; PCM data is passed to the filter()
 	 * method in this format.
 	 */
-	audio_format in_audio_format;
+	AudioFormat in_audio_format;
 
 	/**
 	 * The output audio format; the consumer of this plugin
 	 * expects PCM data in this format.  This defaults to
 	 * #in_audio_format, and can be set with convert_filter_set().
 	 */
-	audio_format out_audio_format;
+	AudioFormat out_audio_format;
 
 	Manual<PcmConvert> state;
 
 public:
-	void Set(const audio_format &_out_audio_format) {
-		assert(audio_format_valid(&in_audio_format));
-		assert(audio_format_valid(&out_audio_format));
-		assert(audio_format_valid(&_out_audio_format));
+	void Set(const AudioFormat &_out_audio_format) {
+		assert(in_audio_format.IsValid());
+		assert(out_audio_format.IsValid());
+		assert(_out_audio_format.IsValid());
 
 		out_audio_format = _out_audio_format;
 	}
 
-	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);
@@ -69,15 +69,15 @@ convert_filter_init(gcc_unused const struct config_param *param,
 	return new ConvertFilter();
 }
 
-const struct audio_format *
-ConvertFilter::Open(audio_format &audio_format, gcc_unused GError **error_r)
+AudioFormat
+ConvertFilter::Open(AudioFormat &audio_format, gcc_unused GError **error_r)
 {
-	assert(audio_format_valid(&audio_format));
+	assert(audio_format.IsValid());
 
 	in_audio_format = out_audio_format = audio_format;
 	state.Construct();
 
-	return &in_audio_format;
+	return in_audio_format;
 }
 
 void
@@ -93,15 +93,15 @@ const void *
 ConvertFilter::FilterPCM(const void *src, size_t src_size,
 			 size_t *dest_size_r, GError **error_r)
 {
-	if (audio_format_equals(&in_audio_format, &out_audio_format)) {
+	if (in_audio_format == out_audio_format) {
 		/* optimized special case: no-op */
 		*dest_size_r = src_size;
 		return src;
 	}
 
-	return state->Convert(&in_audio_format,
+	return state->Convert(in_audio_format,
 			      src, src_size,
-			      &out_audio_format, dest_size_r,
+			      out_audio_format, dest_size_r,
 			      error_r);
 }
 
@@ -111,7 +111,7 @@ const struct filter_plugin convert_filter_plugin = {
 };
 
 void
-convert_filter_set(Filter *_filter, const audio_format &out_audio_format)
+convert_filter_set(Filter *_filter, const AudioFormat out_audio_format)
 {
 	ConvertFilter *filter = (ConvertFilter *)_filter;