diff --git a/headers/private/media/experimental/MediaConnection.h b/headers/private/media/experimental/MediaConnection.h index 408f2e6d37..15993b0d6c 100644 --- a/headers/private/media/experimental/MediaConnection.h +++ b/headers/private/media/experimental/MediaConnection.h @@ -125,8 +125,6 @@ protected: virtual ~BMediaInput(); // Callbacks - virtual status_t FormatChanged(const media_format& format); - virtual void HandleBuffer(BBuffer* buffer); virtual void Connected(const media_format& format); @@ -159,12 +157,8 @@ protected: // Callbacks virtual status_t PrepareToConnect(media_format* format); - virtual status_t FormatProposal(media_format* format); - // TODO: Do we really want this? - virtual status_t FormatChangeRequested(media_format* format); - // When a connection is not binded with another, and you really don't want // to use BMediaGraph it's your job to send the buffer to the connection // you want. You might want to ovverride it so that you can track something, diff --git a/src/kits/media/experimental/MediaClientNode.cpp b/src/kits/media/experimental/MediaClientNode.cpp index dbec7ab677..58efd9b211 100755 --- a/src/kits/media/experimental/MediaClientNode.cpp +++ b/src/kits/media/experimental/MediaClientNode.cpp @@ -260,12 +260,7 @@ BMediaClientNode::FormatChanged(const media_source& source, int32 tag, const media_format& format) { CALLED(); - - BMediaInput* conn = fOwner->_FindInput(dest); - if (conn == NULL) - return B_MEDIA_BAD_DESTINATION; - - return conn->FormatChanged(format); + return B_ERROR; } @@ -314,11 +309,7 @@ BMediaClientNode::FormatChangeRequested(const media_source& source, { CALLED(); - BMediaOutput* conn = fOwner->_FindOutput(source); - if (conn == NULL) - return B_MEDIA_BAD_DESTINATION; - - return conn->FormatChangeRequested(format); + return B_ERROR; } diff --git a/src/kits/media/experimental/MediaConnection.cpp b/src/kits/media/experimental/MediaConnection.cpp index c9bb372057..80cc9385a5 100644 --- a/src/kits/media/experimental/MediaConnection.cpp +++ b/src/kits/media/experimental/MediaConnection.cpp @@ -188,18 +188,6 @@ BMediaInput::~BMediaInput() } -status_t -BMediaInput::FormatChanged(const media_format& format) -{ - if (!format_is_compatible(format, AcceptedFormat())) - return B_MEDIA_BAD_FORMAT; - - SetAcceptedFormat(format); - - return B_OK; -} - - void BMediaInput::HandleBuffer(BBuffer* buffer) { @@ -291,13 +279,6 @@ BMediaOutput::FormatProposal(media_format* format) } -status_t -BMediaOutput::FormatChangeRequested(media_format* format) -{ - return B_ERROR; -} - - status_t BMediaOutput::SendBuffer(BBuffer* buffer) {