summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDario Casalinuovo <b.vitruvio@gmail.com>2017-01-10 19:51:08 (GMT)
committerDario Casalinuovo <b.vitruvio@gmail.com>2017-01-10 20:34:20 (GMT)
commit3ef4b20086422e056b4f217a9c53a46c8dd8b57b (patch)
tree74fc1de78f767d43cf1f24672495ec8b41257194
parenta325242d7fc7445971c844afd013df375ad64e7f (diff)
Make BMediaRecorder publichrev50854
* Fills a functionality lack of the classic media_kit.
-rw-r--r--headers/os/MediaKit.h1
-rw-r--r--headers/os/media/MediaRecorder.h (renamed from headers/private/media/MediaRecorder.h)15
-rw-r--r--headers/private/media/MediaRecorderNode.h2
-rw-r--r--src/kits/media/MediaRecorder.cpp4
-rw-r--r--src/kits/media/MediaRecorderNode.cpp3
5 files changed, 10 insertions, 15 deletions
diff --git a/headers/os/MediaKit.h b/headers/os/MediaKit.h
index 54c993d..6d816f6 100644
--- a/headers/os/MediaKit.h
+++ b/headers/os/MediaKit.h
@@ -15,6 +15,7 @@
#include <MediaFiles.h>
#include <MediaFormats.h>
#include <MediaNode.h>
+#include <MediaRecorder.h>
#include <MediaRoster.h>
#include <MediaTheme.h>
#include <MediaTrack.h>
diff --git a/headers/private/media/MediaRecorder.h b/headers/os/media/MediaRecorder.h
index 885c277..67ea5c6 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 616ef2d..6991760 100644
--- a/headers/private/media/MediaRecorderNode.h
+++ b/headers/private/media/MediaRecorderNode.h
@@ -10,12 +10,12 @@
#include <BufferConsumer.h>
#include <MediaEventLooper.h>
+#include <MediaRecorder.h>
#include <String.h>
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 2871dbe..8278900 100644
--- a/src/kits/media/MediaRecorder.cpp
+++ b/src/kits/media/MediaRecorder.cpp
@@ -13,8 +13,8 @@
#include <MediaRoster.h>
#include <TimeSource.h>
-#include <MediaDebug.h>
-#include <MediaRecorderNode.h>
+#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 40609cd..ec4c58e 100644
--- a/src/kits/media/MediaRecorderNode.cpp
+++ b/src/kits/media/MediaRecorderNode.cpp
@@ -15,8 +15,7 @@
#include <TimedEventQueue.h>
#include <TimeSource.h>
-#include <MediaDebug.h>
-#include <MediaRecorder.h>
+#include "MediaDebug.h"
BMediaRecorderNode::BMediaRecorderNode(const char* name,