From 3ef4b20086422e056b4f217a9c53a46c8dd8b57b Mon Sep 17 00:00:00 2001 From: Dario Casalinuovo Date: Tue, 10 Jan 2017 20:51:08 +0100 Subject: [PATCH] Make BMediaRecorder public * Fills a functionality lack of the classic media_kit. --- headers/os/MediaKit.h | 1 + headers/{private => os}/media/MediaRecorder.h | 15 +++++---------- headers/private/media/MediaRecorderNode.h | 2 +- src/kits/media/MediaRecorder.cpp | 4 ++-- src/kits/media/MediaRecorderNode.cpp | 3 +-- 5 files changed, 10 insertions(+), 15 deletions(-) rename headers/{private => os}/media/MediaRecorder.h (96%) diff --git a/headers/os/MediaKit.h b/headers/os/MediaKit.h index 54c993d998..6d816f6f0f 100644 --- a/headers/os/MediaKit.h +++ b/headers/os/MediaKit.h @@ -15,6 +15,7 @@ #include #include #include +#include #include #include #include diff --git a/headers/private/media/MediaRecorder.h b/headers/os/media/MediaRecorder.h similarity index 96% rename from headers/private/media/MediaRecorder.h rename to headers/os/media/MediaRecorder.h index 885c2774d1..67ea5c6f7f 100644 --- a/headers/private/media/MediaRecorder.h +++ b/headers/os/media/MediaRecorder.h @@ -11,9 +11,10 @@ namespace BPrivate { namespace media { - - class BMediaRecorderNode; +} +} + class BMediaRecorder { public: @@ -105,18 +106,12 @@ private: media_node fOutputNode; media_source fOutputSource; - BMediaRecorderNode* fNode; + BPrivate::media::BMediaRecorderNode* fNode; void* fBufferCookie; uint32 fPadding[32]; - friend class BMediaRecorderNode; + friend class BPrivate::media::BMediaRecorderNode; }; -} - -} - -using namespace BPrivate::media; - #endif // _MEDIA_RECORDER_H diff --git a/headers/private/media/MediaRecorderNode.h b/headers/private/media/MediaRecorderNode.h index 616ef2da6b..699176094d 100644 --- a/headers/private/media/MediaRecorderNode.h +++ b/headers/private/media/MediaRecorderNode.h @@ -10,12 +10,12 @@ #include #include +#include #include namespace BPrivate { namespace media { -class BMediaRecorder; class BMediaRecorderNode : public BMediaEventLooper, public BBufferConsumer { diff --git a/src/kits/media/MediaRecorder.cpp b/src/kits/media/MediaRecorder.cpp index 2871dbe35a..8278900833 100644 --- a/src/kits/media/MediaRecorder.cpp +++ b/src/kits/media/MediaRecorder.cpp @@ -13,8 +13,8 @@ #include #include -#include -#include +#include "MediaDebug.h" +#include "MediaRecorderNode.h" BMediaRecorder::BMediaRecorder(const char* name, media_type type) diff --git a/src/kits/media/MediaRecorderNode.cpp b/src/kits/media/MediaRecorderNode.cpp index 40609cd237..ec4c58ebf9 100644 --- a/src/kits/media/MediaRecorderNode.cpp +++ b/src/kits/media/MediaRecorderNode.cpp @@ -15,8 +15,7 @@ #include #include -#include -#include +#include "MediaDebug.h" BMediaRecorderNode::BMediaRecorderNode(const char* name,