From dcf55c7e328578d435eb14277cb6ba9e072f7e9c Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Mon, 28 Jan 2013 20:32:23 +0100
Subject: InputStream: add constructor/destructor

Eliminate input_stream_init() and input_stream_deinit().
---
 src/input/MmsInputPlugin.cxx | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'src/input/MmsInputPlugin.cxx')

diff --git a/src/input/MmsInputPlugin.cxx b/src/input/MmsInputPlugin.cxx
index be583e283..b347eb92b 100644
--- a/src/input/MmsInputPlugin.cxx
+++ b/src/input/MmsInputPlugin.cxx
@@ -42,9 +42,8 @@ struct MmsInputStream {
 	MmsInputStream(const char *uri,
 		       Mutex &mutex, Cond &cond,
 		       mmsx_t *_mms)
-		:mms(_mms), eof(false) {
-		input_stream_init(&base, &input_plugin_mms, uri, mutex, cond);
-
+		:base(input_plugin_mms, uri, mutex, cond),
+		 mms(_mms), eof(false) {
 		/* XX is this correct?  at least this selects the ffmpeg
 		   decoder, which seems to work fine*/
 		base.mime = g_strdup("audio/x-ms-wma");
@@ -54,7 +53,6 @@ struct MmsInputStream {
 
 	~MmsInputStream() {
 		mmsx_close(mms);
-		input_stream_deinit(&base);
 	}
 };
 
-- 
cgit v1.2.3