hrev51808 adds 1 changeset to branch 'master'
old head: c61ffa962ebddb905fb44fad4f61efe4bc9dc843
new head: befa252fbf9f9d2eff18bb500a0211461ce8ac57
overview:
http://cgit.haiku-os.org/haiku/log/?qt=range&q=befa252fbf9f+%5Ec61ffa962ebd
----------------------------------------------------------------------------
befa252fbf9f: MediaConnection: Non simple connections should be inherited
* BSimpleMediaConnections are provided for that.
* Make SetOutputEnabled private.
[ Barrett17 <b.vitruvio@xxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev51808
Commit: befa252fbf9f9d2eff18bb500a0211461ce8ac57
URL: http://cgit.haiku-os.org/haiku/commit/?id=befa252fbf9f
Author: Barrett17 <b.vitruvio@xxxxxxxxx>
Date: Sat Feb 24 15:13:34 2018 UTC
----------------------------------------------------------------------------
3 files changed, 10 insertions(+), 13 deletions(-)
headers/private/media/experimental/MediaConnection.h | 15 ++++++---------
src/kits/media/experimental/MediaClientNode.cpp | 4 ++--
src/kits/media/experimental/MediaConnection.cpp | 4 ++--
----------------------------------------------------------------------------
diff --git a/headers/private/media/experimental/MediaConnection.h
b/headers/private/media/experimental/MediaConnection.h
index 80e05c4bb4..b79f80fefe 100644
--- a/headers/private/media/experimental/MediaConnection.h
+++ b/headers/private/media/experimental/MediaConnection.h
@@ -115,10 +115,8 @@ private:
class BMediaInput : public virtual BMediaConnection {
-public:
-
BMediaInput();
-
protected:
+
BMediaInput();
virtual ~BMediaInput();
// Callbacks
@@ -147,13 +145,8 @@ private:
class BMediaOutput : public virtual BMediaConnection {
-public:
-
BMediaOutput();
-
- void SetEnabled(bool
enabled);
- bool IsEnabled()
const;
-
protected:
+
BMediaOutput();
virtual ~BMediaOutput();
// Callbacks
@@ -172,6 +165,10 @@ protected:
private:
media_output _MediaOutput() const;
+ // TODO: possibly unneeded.
+ void
_SetEnabled(bool enabled);
+ bool _IsEnabled()
const;
+
bool fEnabled;
size_t fFramesSent;
diff --git a/src/kits/media/experimental/MediaClientNode.cpp
b/src/kits/media/experimental/MediaClientNode.cpp
index d195a1a817..dbec7ab677 100755
--- a/src/kits/media/experimental/MediaClientNode.cpp
+++ b/src/kits/media/experimental/MediaClientNode.cpp
@@ -479,7 +479,7 @@ BMediaClientNode::EnableOutput(const media_source& source,
BMediaOutput* conn = fOwner->_FindOutput(source);
if (conn != NULL)
- conn->SetEnabled(enabled);
+ conn->_SetEnabled(enabled);
}
@@ -623,7 +623,7 @@ BMediaClientNode::_ProduceNewBuffer(const
media_timed_event* event,
if (output == NULL)
return;
- if (output->IsEnabled()) {
+ if (output->_IsEnabled()) {
BBuffer* buffer = _GetNextBuffer(output, event->event_time);
if (buffer != NULL) {
diff --git a/src/kits/media/experimental/MediaConnection.cpp
b/src/kits/media/experimental/MediaConnection.cpp
index deba0e7b9e..9260086597 100644
--- a/src/kits/media/experimental/MediaConnection.cpp
+++ b/src/kits/media/experimental/MediaConnection.cpp
@@ -269,7 +269,7 @@ BMediaOutput::~BMediaOutput()
bool
-BMediaOutput::IsEnabled() const
+BMediaOutput::_IsEnabled() const
{
CALLED();
@@ -278,7 +278,7 @@ BMediaOutput::IsEnabled() const
void
-BMediaOutput::SetEnabled(bool enabled)
+BMediaOutput::_SetEnabled(bool enabled)
{
fEnabled = enabled;
}
