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/CdioParanoiaInputPlugin.cxx | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

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

diff --git a/src/input/CdioParanoiaInputPlugin.cxx b/src/input/CdioParanoiaInputPlugin.cxx
index 129eb75b7..942eefb99 100644
--- a/src/input/CdioParanoiaInputPlugin.cxx
+++ b/src/input/CdioParanoiaInputPlugin.cxx
@@ -56,11 +56,10 @@ struct CdioParanoiaInputStream {
 
 	CdioParanoiaInputStream(const char *uri, Mutex &mutex, Cond &cond,
 				int _trackno)
-		:drv(nullptr), cdio(nullptr), para(nullptr),
+		:base(input_plugin_cdio_paranoia, uri, mutex, cond),
+		 drv(nullptr), cdio(nullptr), para(nullptr),
 		 trackno(_trackno)
 	{
-		input_stream_init(&base, &input_plugin_cdio_paranoia, uri,
-				  mutex, cond);
 	}
 
 	~CdioParanoiaInputStream() {
@@ -70,8 +69,6 @@ struct CdioParanoiaInputStream {
 			cdio_cddap_close_no_free_cdio(drv);
 		if (cdio != nullptr)
 			cdio_destroy(cdio);
-
-		input_stream_deinit(&base);
 	}
 };
 
-- 
cgit v1.2.3