From 83bcc405f3eb59e4cacc9039d0332d63548aec3d Mon Sep 17 00:00:00 2001 From: Barrett17 Date: Fri, 2 Mar 2018 00:52:33 +0100 Subject: [PATCH] MediaClientDefs: Cleanup unneded methods --- .../media/experimental/MediaClientDefs.h | 4 ---- src/kits/media/experimental/MediaClient.cpp | 18 ++++++++-------- .../media/experimental/MediaClientDefs.cpp | 21 ------------------- .../media/experimental/MediaConnection.cpp | 4 ++-- 4 files changed, 11 insertions(+), 36 deletions(-) diff --git a/headers/private/media/experimental/MediaClientDefs.h b/headers/private/media/experimental/MediaClientDefs.h index c106ade6a9..e91584da17 100644 --- a/headers/private/media/experimental/MediaClientDefs.h +++ b/headers/private/media/experimental/MediaClientDefs.h @@ -74,11 +74,7 @@ private: media_input _BuildMediaInput() const; media_output _BuildMediaOutput() const; - const media_source& _Source() const; - const media_destination& _Destination() const; - media_node _Node() const; - media_node _RemoteNode() const; media_connection_id id; diff --git a/src/kits/media/experimental/MediaClient.cpp b/src/kits/media/experimental/MediaClient.cpp index 7bda5af4d4..8d425f1f9d 100755 --- a/src/kits/media/experimental/MediaClient.cpp +++ b/src/kits/media/experimental/MediaClient.cpp @@ -289,7 +289,7 @@ BMediaClient::FindInput(const media_connection& input) const if (!input.IsInput()) return NULL; - return _FindInput(input._Destination()); + return _FindInput(input.destination); } @@ -301,7 +301,7 @@ BMediaClient::FindOutput(const media_connection& output) const if (!output.IsOutput()) return NULL; - return _FindOutput(output._Source()); + return _FindOutput(output.source); } @@ -321,7 +321,7 @@ BMediaClient::Start() status_t err = B_OK; for (int32 i = 0; i < CountOutputs(); i++) { - media_node remoteNode = OutputAt(i)->Connection()._RemoteNode(); + media_node remoteNode = OutputAt(i)->Connection().remote_node; if (remoteNode.kind & B_TIME_SOURCE) err = BMediaRoster::CurrentRoster()->StartTimeSource( remoteNode, BTimeSource::RealTime()); @@ -491,7 +491,7 @@ BMediaClient::_ConnectInput(BMediaOutput* output, { CALLED(); - if (input._Destination() == media_destination::null) + if (input.destination == media_destination::null) return B_MEDIA_BAD_DESTINATION; media_output ourOutput = output->Connection()._BuildMediaOutput(); @@ -521,7 +521,7 @@ BMediaClient::_ConnectOutput(BMediaInput* input, { CALLED(); - if (output._Source() == media_source::null) + if (output.source == media_source::null) return B_MEDIA_BAD_SOURCE; media_input ourInput = input->Connection()._BuildMediaInput(); @@ -554,12 +554,12 @@ BMediaClient::_DisconnectConnection(BMediaConnection* conn) const media_connection& handle = conn->Connection(); if (handle.IsInput()) { return BMediaRoster::CurrentRoster()->Disconnect( - handle._RemoteNode().node, handle._Source(), - handle._Node().node, handle._Destination()); + handle.remote_node.node, handle.source, + handle._Node().node, handle.destination); } else { return BMediaRoster::CurrentRoster()->Disconnect( - handle._Node().node, handle._Source(), - handle._RemoteNode().node, handle._Destination()); + handle._Node().node, handle.source, + handle.remote_node.node, handle.destination); } return B_ERROR; diff --git a/src/kits/media/experimental/MediaClientDefs.cpp b/src/kits/media/experimental/MediaClientDefs.cpp index 8bbd44b162..01de742b70 100644 --- a/src/kits/media/experimental/MediaClientDefs.cpp +++ b/src/kits/media/experimental/MediaClientDefs.cpp @@ -82,27 +82,6 @@ media_connection::_BuildMediaOutput() const } -const media_source& -media_connection::_Source() const -{ - return source; -} - - -const media_destination& -media_connection::_Destination() const -{ - return destination; -} - - -media_node -media_connection::_RemoteNode() const -{ - return remote_node; -} - - media_node media_connection::_Node() const { diff --git a/src/kits/media/experimental/MediaConnection.cpp b/src/kits/media/experimental/MediaConnection.cpp index 525a41c64d..5d667fb4e0 100644 --- a/src/kits/media/experimental/MediaConnection.cpp +++ b/src/kits/media/experimental/MediaConnection.cpp @@ -136,14 +136,14 @@ BMediaConnection::_ConnectionRegistered(BMediaClient* owner, const media_source& BMediaConnection::_Source() const { - return fConnection._Source(); + return fConnection.source; } const media_destination& BMediaConnection::_Destination() const { - return fConnection._Destination(); + return fConnection.destination; }