From 9198105dbb1eb9a912e42c37a59e2874fe9babcc Mon Sep 17 00:00:00 2001
From: Dario Casalinuovo <b.vitruvio@gmail.com>
Date: Thu, 4 May 2017 13:59:12 +0200
Subject: [PATCH] MediaWriter/MediaExtractor: Remove BUrl constructors

---
 headers/private/media/MediaExtractor.h |  5 -----
 headers/private/media/MediaWriter.h    |  6 ------
 src/kits/media/MediaExtractor.cpp      | 21 ---------------------
 src/kits/media/MediaWriter.cpp         | 18 ------------------
 4 files changed, 50 deletions(-)

diff --git a/headers/private/media/MediaExtractor.h b/headers/private/media/MediaExtractor.h
index ae8200d20c..eb3220386a 100644
--- a/headers/private/media/MediaExtractor.h
+++ b/headers/private/media/MediaExtractor.h
@@ -10,10 +10,7 @@
 #define _MEDIA_EXTRACTOR_H
 
 
-#include <Url.h>
-
 #include "ReaderPlugin.h"
-#include "StreamerPlugin.h"
 #include "DecoderPlugin.h"
 
 
@@ -40,7 +37,6 @@ struct stream_info {
 class MediaExtractor {
 public:
 								MediaExtractor(BDataIO* source, int32 flags);
-								MediaExtractor(const BUrl& url, int32 flags);
 
 								~MediaExtractor();
 
@@ -91,7 +87,6 @@ private:
 
 			BDataIO*			fSource;
 			Reader*				fReader;
-			Streamer*			fStreamer;
 
 			stream_info*		fStreamInfo;
 			int32				fStreamCount;
diff --git a/headers/private/media/MediaWriter.h b/headers/private/media/MediaWriter.h
index ef3ae8336d..ce5e05fd7c 100644
--- a/headers/private/media/MediaWriter.h
+++ b/headers/private/media/MediaWriter.h
@@ -6,10 +6,7 @@
 #define _MEDIA_WRITER_H
 
 
-#include <Url.h>
-
 #include "EncoderPlugin.h"
-#include "StreamerPlugin.h"
 #include "TList.h"
 #include "WriterPlugin.h"
 
@@ -22,8 +19,6 @@ class MediaWriter {
 public:
 								MediaWriter(BDataIO* target,
 									const media_file_format& fileFormat);
-								MediaWriter(BUrl url,
-									const media_file_format& fileFormat);
 								~MediaWriter();
 
 			status_t			InitCheck();
@@ -59,7 +54,6 @@ private:
 private:
 			BDataIO*			fTarget;
 			Writer*				fWriter;
-			Streamer*			fStreamer;
 
 			List<StreamInfo>	fStreamInfos;
 
diff --git a/src/kits/media/MediaExtractor.cpp b/src/kits/media/MediaExtractor.cpp
index 154dd5047c..1029c29ccf 100644
--- a/src/kits/media/MediaExtractor.cpp
+++ b/src/kits/media/MediaExtractor.cpp
@@ -56,7 +56,6 @@ MediaExtractor::MediaExtractor(BDataIO* source, int32 flags)
 	:
 	fExtractorThread(-1),
 	fReader(NULL),
-	fStreamer(NULL),
 	fStreamInfo(NULL),
 	fStreamCount(0)
 {
@@ -64,23 +63,6 @@ MediaExtractor::MediaExtractor(BDataIO* source, int32 flags)
 }
 
 
-MediaExtractor::MediaExtractor(const BUrl& url, int32 flags)
-	:
-	fExtractorThread(-1),
-	fReader(NULL),
-	fStreamer(NULL),
-	fStreamInfo(NULL),
-	fStreamCount(0)
-{
-	BDataIO* source = NULL;
-	fInitStatus = gPluginManager.CreateStreamer(&fStreamer, url, &source);
-	if (fInitStatus != B_OK)
-		return;
-
-	_Init(source, flags);
-}
-
-
 void
 MediaExtractor::_Init(BDataIO* source, int32 flags)
 {
@@ -184,9 +166,6 @@ MediaExtractor::~MediaExtractor()
 
 	gPluginManager.DestroyReader(fReader);
 
-	if (fStreamer != NULL)
-		gPluginManager.DestroyStreamer(fStreamer);
-
 	delete[] fStreamInfo;
 	// fSource is owned by the BMediaFile
 }
diff --git a/src/kits/media/MediaWriter.cpp b/src/kits/media/MediaWriter.cpp
index dd9847cba9..8df949f328 100644
--- a/src/kits/media/MediaWriter.cpp
+++ b/src/kits/media/MediaWriter.cpp
@@ -48,7 +48,6 @@ MediaWriter::MediaWriter(BDataIO* target, const media_file_format& fileFormat)
 	:
 	fTarget(target),
 	fWriter(NULL),
-	fStreamer(NULL),
 	fStreamInfos(),
 	fFileFormat(fileFormat)
 {
@@ -58,23 +57,6 @@ MediaWriter::MediaWriter(BDataIO* target, const media_file_format& fileFormat)
 }
 
 
-MediaWriter::MediaWriter(BUrl url, const media_file_format& fileFormat)
-	:
-	fTarget(NULL),
-	fWriter(NULL),
-	fStreamer(NULL),
-	fStreamInfos(),
-	fFileFormat(fileFormat)
-{
-	CALLED();
-
-	if (gPluginManager.CreateStreamer(&fStreamer, url, &fTarget) != B_OK)
-		return;
-
-	gPluginManager.CreateWriter(&fWriter, fFileFormat, fTarget);
-}
-
-
 MediaWriter::~MediaWriter()
 {
 	CALLED();