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

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

diff --git a/src/input/FfmpegInputPlugin.cxx b/src/input/FfmpegInputPlugin.cxx
index 2e44f74b7..1660f177d 100644
--- a/src/input/FfmpegInputPlugin.cxx
+++ b/src/input/FfmpegInputPlugin.cxx
@@ -44,10 +44,8 @@ struct FfmpegInputStream {
 
 	FfmpegInputStream(const char *uri, Mutex &mutex, Cond &cond,
 			  AVIOContext *_h)
-		:h(_h), eof(false) {
-		input_stream_init(&base, &input_plugin_ffmpeg,
-				  uri, mutex, cond);
-
+		:base(input_plugin_ffmpeg, uri, mutex, cond),
+		 h(_h), eof(false) {
 		base.ready = true;
 		base.seekable = (h->seekable & AVIO_SEEKABLE_NORMAL) != 0;
 		base.size = avio_size(h);
@@ -61,7 +59,6 @@ struct FfmpegInputStream {
 
 	~FfmpegInputStream() {
 		avio_close(h);
-		input_stream_deinit(&base);
 	}
 };
 
-- 
cgit v1.2.3