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

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

diff --git a/src/input/FileInputPlugin.cxx b/src/input/FileInputPlugin.cxx
index 7681ee0c9..2eecf32b6 100644
--- a/src/input/FileInputPlugin.cxx
+++ b/src/input/FileInputPlugin.cxx
@@ -42,10 +42,8 @@ struct FileInputStream {
 
 	FileInputStream(const char *path, int _fd, off_t size,
 			Mutex &mutex, Cond &cond)
-		:fd(_fd) {
-		input_stream_init(&base, &input_plugin_file, path,
-				  mutex, cond);
-
+		:base(input_plugin_file, path, mutex, cond),
+		 fd(_fd) {
 		base.size = size;
 		base.seekable = true;
 		base.ready = true;
@@ -53,7 +51,6 @@ struct FileInputStream {
 
 	~FileInputStream() {
 		close(fd);
-		input_stream_deinit(&base);
 	}
 };
 
-- 
cgit v1.2.3