3 files changed, 11 insertions, 11 deletions
diff --git a/src/output/plugins/RecorderOutputPlugin.cxx b/src/output/plugins/RecorderOutputPlugin.cxx
index fb73f7b6f..f6508e33c 100644
--- a/src/output/plugins/RecorderOutputPlugin.cxx
+++ b/src/output/plugins/RecorderOutputPlugin.cxx
@@ -64,7 +64,7 @@ class RecorderOutput {
 
 	~RecorderOutput() {
 		if (encoder != nullptr)
-			encoder_finish(encoder);
+			encoder->Dispose();
 	}
 
 	bool Initialize(const config_param &param, Error &error_r) {
@@ -175,13 +175,13 @@ RecorderOutput::Open(AudioFormat &audio_format, Error &error)
 
 	/* open the encoder */
 
-	if (!encoder_open(encoder, audio_format, error)) {
+	if (!encoder->Open(audio_format, error)) {
 		delete file;
 		return false;
 	}
 
 	if (!EncoderToFile(error)) {
-		encoder_close(encoder);
+		encoder->Close();
 		delete file;
 		return false;
 	}
@@ -199,7 +199,7 @@ RecorderOutput::Commit(Error &error)
 
 	/* now really close everything */
 
-	encoder_close(encoder);
+	encoder->Close();
 
 	if (success && !file->Commit(error))
 		success = false;
diff --git a/src/output/plugins/ShoutOutputPlugin.cxx b/src/output/plugins/ShoutOutputPlugin.cxx
index e5d8b23a4..f9070026e 100644
--- a/src/output/plugins/ShoutOutputPlugin.cxx
+++ b/src/output/plugins/ShoutOutputPlugin.cxx
@@ -346,7 +346,7 @@ static void close_shout_conn(ShoutOutput * sd)
 		if (encoder_end(sd->encoder, IgnoreError()))
 			write_page(sd, IgnoreError());
 
-		encoder_close(sd->encoder);
+		sd->encoder->Close();
 	}
 
 	if (shout_get_connected(sd->shout_conn) != SHOUTERR_UNCONNECTED &&
@@ -362,7 +362,7 @@ my_shout_finish_driver(AudioOutput *ao)
 {
 	ShoutOutput *sd = (ShoutOutput *)ao;
 
-	encoder_finish(sd->encoder);
+	sd->encoder->Dispose();
 
 	delete sd;
 
@@ -416,13 +416,13 @@ my_shout_open_device(AudioOutput *ao, AudioFormat &audio_format,
 	if (!shout_connect(sd, error))
 		return false;
 
-	if (!encoder_open(sd->encoder, audio_format, error)) {
+	if (!sd->encoder->Open(audio_format, error)) {
 		shout_close(sd->shout_conn);
 		return false;
 	}
 
 	if (!write_page(sd, error)) {
-		encoder_close(sd->encoder);
+		sd->encoder->Close();
 		shout_close(sd->shout_conn);
 		return false;
 	}
diff --git a/src/output/plugins/httpd/HttpdOutputPlugin.cxx b/src/output/plugins/httpd/HttpdOutputPlugin.cxx
index 811cdaaff..19ee38cd2 100644
--- a/src/output/plugins/httpd/HttpdOutputPlugin.cxx
+++ b/src/output/plugins/httpd/HttpdOutputPlugin.cxx
@@ -64,7 +64,7 @@ HttpdOutput::~HttpdOutput()
 		metadata->Unref();
 
 	if (encoder != nullptr)
-		encoder_finish(encoder);
+		encoder->Dispose();
 
 }
 
@@ -295,7 +295,7 @@ httpd_output_disable(AudioOutput *ao)
 inline bool
 HttpdOutput::OpenEncoder(AudioFormat &audio_format, Error &error)
 {
-	if (!encoder_open(encoder, audio_format, error))
+	if (!encoder->Open(audio_format, error))
 		return false;
 
 	/* we have to remember the encoder header, i.e. the first
@@ -355,7 +355,7 @@ HttpdOutput::Close()
 	if (header != nullptr)
 		header->Unref();
 
-	encoder_close(encoder);
+	encoder->Close();
 }
 
 static void