mirror of
https://review.haiku-os.org/haiku
synced 2025-01-31 18:56:49 +01:00
MediaWriter/MediaExtractor: Remove BUrl constructors
This commit is contained in:
parent
dfecb37aee
commit
9198105dbb
@ -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;
|
||||
|
@ -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;
|
||||
|
||||
|
@ -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
|
||||
}
|
||||
|
@ -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();
|
||||
|
Loading…
x
Reference in New Issue
Block a user