From 80d2028bac81a7135b54eff1d2566b403814e6b5 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Mon, 9 May 2016 13:22:27 +0200
Subject: encoder/vorbis: merge Clear() into the destructor

---
 src/encoder/plugins/VorbisEncoderPlugin.cxx | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

(limited to 'src/encoder')

diff --git a/src/encoder/plugins/VorbisEncoderPlugin.cxx b/src/encoder/plugins/VorbisEncoderPlugin.cxx
index ab097131f..2beb98eb7 100644
--- a/src/encoder/plugins/VorbisEncoderPlugin.cxx
+++ b/src/encoder/plugins/VorbisEncoderPlugin.cxx
@@ -42,7 +42,9 @@ public:
 		:OggEncoder(true) {}
 
 	virtual ~VorbisEncoder() {
-		Clear();
+		vorbis_block_clear(&vb);
+		vorbis_dsp_clear(&vd);
+		vorbis_info_clear(&vi);
 	}
 
 	bool Open(float quality, int bitrate, AudioFormat &audio_format,
@@ -62,7 +64,6 @@ private:
 	void HeaderOut(vorbis_comment &vc);
 	void SendHeader();
 	void BlockOut();
-	void Clear();
 };
 
 class PreparedVorbisEncoder final : public PreparedEncoder {
@@ -219,14 +220,6 @@ PreparedVorbisEncoder::Open(AudioFormat &audio_format, Error &error)
 	return e;
 }
 
-void
-VorbisEncoder::Clear()
-{
-	vorbis_block_clear(&vb);
-	vorbis_dsp_clear(&vd);
-	vorbis_info_clear(&vi);
-}
-
 void
 VorbisEncoder::BlockOut()
 {
-- 
cgit v1.2.3