From 486872713c9c6676ed6c0186dd902db2f43b6b86 Mon Sep 17 00:00:00 2001 From: Barrett17 Date: Thu, 21 Feb 2019 16:36:16 +0100 Subject: [PATCH] http_streamer: API update --- .../http_streamer/HTTPStreamerPlugin.cpp | 19 ++++++++++++------- .../http_streamer/HTTPStreamerPlugin.h | 9 ++++++++- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/src/add-ons/media/plugins/http_streamer/HTTPStreamerPlugin.cpp b/src/add-ons/media/plugins/http_streamer/HTTPStreamerPlugin.cpp index 911bfb680e..bed093cc83 100644 --- a/src/add-ons/media/plugins/http_streamer/HTTPStreamerPlugin.cpp +++ b/src/add-ons/media/plugins/http_streamer/HTTPStreamerPlugin.cpp @@ -6,8 +6,6 @@ #include "HTTPStreamerPlugin.h" -#include "HTTPMediaIO.h" - #include "MediaDebug.h" @@ -31,22 +29,29 @@ HTTPStreamer::~HTTPStreamer() status_t -HTTPStreamer::Sniff(const BUrl& url, BDataIO** source) +HTTPStreamer::Sniff(const BUrl& url) { CALLED(); - HTTPMediaIO* outSource = new HTTPMediaIO(url); + HTTPMediaIO* adapter = new HTTPMediaIO(url); - status_t ret = outSource->Open(); + status_t ret = adapter->Open(); if (ret == B_OK) { - *source = outSource; + fAdapter = adapter; return B_OK; } - delete outSource; + delete adapter; return ret; } +BMediaIO* +HTTPStreamer::Adapter() const +{ + return fAdapter; +} + + BStreamer* HTTPStreamerPlugin::NewStreamer() { diff --git a/src/add-ons/media/plugins/http_streamer/HTTPStreamerPlugin.h b/src/add-ons/media/plugins/http_streamer/HTTPStreamerPlugin.h index cd33260e27..1fa15e32e7 100644 --- a/src/add-ons/media/plugins/http_streamer/HTTPStreamerPlugin.h +++ b/src/add-ons/media/plugins/http_streamer/HTTPStreamerPlugin.h @@ -8,6 +8,9 @@ #include +#include "HTTPMediaIO.h" + +using BCodecKit::BMediaIO; using BCodecKit::BMediaPlugin; using BCodecKit::BStreamer; using BCodecKit::BStreamerPlugin; @@ -19,7 +22,11 @@ public: HTTPStreamer(); virtual ~HTTPStreamer(); - virtual status_t Sniff(const BUrl& url, BDataIO** source); + virtual status_t Sniff(const BUrl& url); + virtual BMediaIO* Adapter() const; + +private: + HTTPMediaIO* fAdapter; };