Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MediaClient: Remove BeginConnection for external connections

Browse Source 
* While it looked like a good formalism, there's no need to add
unneeded complex steps to the user of the API.
This commit is contained in:
Dario Casalinuovo 2016-11-17 02:43:40 +01:00
parent 34619a6fd7
commit 0253ecbd9e
2 changed files with 3 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
headers/private/media/MediaClient.h
View File

@ -85,14 +85,6 @@ public:
virtual BMediaConnection* BeginConnection(const media_input& input); virtual BMediaConnection* BeginConnection(const media_input& input);
virtual BMediaConnection* BeginConnection(const media_output& output); virtual BMediaConnection* BeginConnection(const media_output& output);
// This is used when we want to connect us with another BMediaClient, the
// returned connection is the one you will use to call the Connect method
// and will represents it by the point of view of this node. Don't try to
// use directly connections built by another BMediaClient, it will fail,
// always pass between this function to get a local connection from the point
// of view of *this* node and then call Connect().
virtual BMediaConnection* BeginConnection(BMediaConnection* connection);
// Bind internally two connections of the same BMediaClient, so that the // Bind internally two connections of the same BMediaClient, so that the
// input will be automatically forwarded to the output just after the // input will be automatically forwarded to the output just after the
// ProcessFunc is called. The buffer is automatically recycled too. // ProcessFunc is called. The buffer is automatically recycled too.
@ -107,8 +99,9 @@ public:
// If the user want a particular format for a connection it should // If the user want a particular format for a connection it should
// use BMediaConnection::SetAcceptedFormat(), if it's not specified // use BMediaConnection::SetAcceptedFormat(), if it's not specified
// BMediaClient::Format() will be used, in case both aren't specified // BMediaClient::Format() will be used, in case both aren't specified
// an error is returned. The connection should always belong to this // an error is returned. The first parameter should always belong to
// node, in any other case it will return an error. // this node, the second will be a connection obtained from another
// BMediaClient.
virtual status_t Connect(BMediaConnection* ourConnection, virtual status_t Connect(BMediaConnection* ourConnection,
BMediaConnection* theirConnection); BMediaConnection* theirConnection);

17
src/kits/media/MediaClient.cpp
View File

@ -92,23 +92,6 @@ BMediaClient::BeginConnection(const media_output& output)
} }
BMediaConnection*
BMediaClient::BeginConnection(BMediaConnection* connection)
{
CALLED();
if (connection->fOwner == this)
return NULL;
BMediaConnection* ret = NULL;
if (_TranslateConnection(ret, connection) == B_OK) {
AddConnection(ret);
return ret;
}
return NULL;
}
status_t status_t
BMediaClient::Bind(BMediaConnection* input, BMediaConnection* output) BMediaClient::Bind(BMediaConnection* input, BMediaConnection* output)
{ {