From 8c7679851f61f3e9d32951ea7eff7a89c78f9442 Mon Sep 17 00:00:00 2001 From: Dario Casalinuovo Date: Fri, 25 Mar 2016 22:44:56 +0100 Subject: [PATCH] Move MediaIO in it's own header --- headers/os/support/DataIO.h | 25 -------------- headers/private/media/MediaIO.h | 34 +++++++++++++++++++ headers/private/media/StreamerPlugin.h | 5 ++- .../media/plugins/ffmpeg/AVFormatReader.cpp | 2 +- .../media/plugins/ffmpeg/AVFormatWriter.cpp | 2 +- src/kits/media/Jamfile | 1 + src/kits/media/MediaIO.cpp | 31 +++++++++++++++++ src/kits/support/DataIO.cpp | 24 ------------- 8 files changed, 72 insertions(+), 52 deletions(-) create mode 100644 headers/private/media/MediaIO.h create mode 100644 src/kits/media/MediaIO.cpp diff --git a/headers/os/support/DataIO.h b/headers/os/support/DataIO.h index e110342465..d05a4c8d4f 100644 --- a/headers/os/support/DataIO.h +++ b/headers/os/support/DataIO.h @@ -163,29 +163,4 @@ private: }; -class BMediaIO : public BPositionIO { -public: - BMediaIO(); - virtual ~BMediaIO(); - - virtual bool IsSeekable() const = 0; - virtual bool IsFile() const = 0; - - virtual bool IsEndless() const = 0; - virtual bool IsCached() const = 0; - virtual size_t CacheSize() const = 0; - -private: - BMediaIO(const BMediaIO&); - BMallocIO& operator=(const BMediaIO&); - - virtual void _ReservedMediaIO1(); - virtual void _ReservedMediaIO2(); - virtual void _ReservedMediaIO3(); - virtual void _ReservedMediaIO4(); - virtual void _ReservedMediaIO5(); - - uint32 _reserved[1]; -}; - #endif // _DATA_IO_H diff --git a/headers/private/media/MediaIO.h b/headers/private/media/MediaIO.h new file mode 100644 index 0000000000..55bb7e0893 --- /dev/null +++ b/headers/private/media/MediaIO.h @@ -0,0 +1,34 @@ +/* + * Copyright 2016 Haiku, Inc. All rights reserved. + * Distributed under the terms of the MIT License. + */ +#ifndef _MEDIA_IO_H +#define _MEDIA_IO_H + + +#include +#include + + +class BMediaIO : public BPositionIO { +public: + BMediaIO(); + virtual ~BMediaIO(); + + virtual bool IsSeekable() const = 0; + virtual bool IsEndless() const = 0; + +private: + BMediaIO(const BMediaIO&); + BMallocIO& operator=(const BMediaIO&); + + virtual void _ReservedMediaIO1(); + virtual void _ReservedMediaIO2(); + virtual void _ReservedMediaIO3(); + virtual void _ReservedMediaIO4(); + virtual void _ReservedMediaIO5(); + + uint32 _reserved[1]; +}; + +#endif // _MEDIA_IO_H diff --git a/headers/private/media/StreamerPlugin.h b/headers/private/media/StreamerPlugin.h index ab9ac7ca11..60f26ff8a6 100644 --- a/headers/private/media/StreamerPlugin.h +++ b/headers/private/media/StreamerPlugin.h @@ -1,12 +1,14 @@ #ifndef _STREAMER_PLUGIN_H #define _STREAMER_PLUGIN_H -#include + +#include #include #include #include "MediaPlugin.h" + namespace BPrivate { namespace media { class PluginManager; @@ -41,4 +43,5 @@ public: using namespace BPrivate::media; + #endif // _STREAMER_PLUGIN_H diff --git a/src/add-ons/media/plugins/ffmpeg/AVFormatReader.cpp b/src/add-ons/media/plugins/ffmpeg/AVFormatReader.cpp index 288aee74d4..b28ead061c 100644 --- a/src/add-ons/media/plugins/ffmpeg/AVFormatReader.cpp +++ b/src/add-ons/media/plugins/ffmpeg/AVFormatReader.cpp @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/add-ons/media/plugins/ffmpeg/AVFormatWriter.cpp b/src/add-ons/media/plugins/ffmpeg/AVFormatWriter.cpp index 842fcdff67..41d8dc22cf 100644 --- a/src/add-ons/media/plugins/ffmpeg/AVFormatWriter.cpp +++ b/src/add-ons/media/plugins/ffmpeg/AVFormatWriter.cpp @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/kits/media/Jamfile b/src/kits/media/Jamfile index ee97010a35..4ab180eab4 100644 --- a/src/kits/media/Jamfile +++ b/src/kits/media/Jamfile @@ -24,6 +24,7 @@ for architectureObject in [ MultiArchSubDirSetup ] { !missing_symbols.cpp Deprecated.cpp MediaRecorder.cpp + MediaIO.cpp # Public Media Kit Buffer.cpp diff --git a/src/kits/media/MediaIO.cpp b/src/kits/media/MediaIO.cpp new file mode 100644 index 0000000000..1d8ec70399 --- /dev/null +++ b/src/kits/media/MediaIO.cpp @@ -0,0 +1,31 @@ +/* + * Copyright 2016 Dario Casalinuovo. All rights reserved. + * Distributed under the terms of the MIT License. + * + */ + +#include + + +BMediaIO::BMediaIO() +{ +} + + +BMediaIO::BMediaIO(const BMediaIO &) +{ + // copying not allowed... +} + + +BMediaIO::~BMediaIO() +{ +} + + +// FBC +void BMediaIO::_ReservedMediaIO1() {} +void BMediaIO::_ReservedMediaIO2() {} +void BMediaIO::_ReservedMediaIO3() {} +void BMediaIO::_ReservedMediaIO4() {} +void BMediaIO::_ReservedMediaIO5() {} diff --git a/src/kits/support/DataIO.cpp b/src/kits/support/DataIO.cpp index 1a647d27ec..57a5796f35 100644 --- a/src/kits/support/DataIO.cpp +++ b/src/kits/support/DataIO.cpp @@ -601,27 +601,3 @@ BMallocIO::operator=(const BMallocIO &) // FBC void BMallocIO::_ReservedMallocIO1() {} void BMallocIO::_ReservedMallocIO2() {} - - -BMediaIO::BMediaIO() -{ -} - - -BMediaIO::BMediaIO(const BMediaIO &) -{ - // copying not allowed... -} - - -BMediaIO::~BMediaIO() -{ -} - - -// FBC -void BMediaIO::_ReservedMediaIO1() {} -void BMediaIO::_ReservedMediaIO2() {} -void BMediaIO::_ReservedMediaIO3() {} -void BMediaIO::_ReservedMediaIO4() {} -void BMediaIO::_ReservedMediaIO5() {}