From cc0d365ef7550b8613c8aa72c61ac24fd1260f68 Mon Sep 17 00:00:00 2001 From: Dario Casalinuovo Date: Tue, 9 Feb 2016 14:11:29 +0100 Subject: [PATCH] BMediaRecorder: Fix unneeded argument and error check --- headers/private/media/MediaRecorder.h | 3 +-- src/kits/media/MediaRecorder.cpp | 2 +- src/kits/media/MediaRecorderNode.cpp | 6 ++++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/headers/private/media/MediaRecorder.h b/headers/private/media/MediaRecorder.h index eeb64f0dc8..885c2774d1 100644 --- a/headers/private/media/MediaRecorder.h +++ b/headers/private/media/MediaRecorder.h @@ -76,8 +76,7 @@ protected: virtual void BufferReceived(void* buffer, size_t size, const media_header& header); - status_t SetUpConnection(media_input ourInput, - media_source outputSource); + status_t SetUpConnection(media_source outputSource); private: diff --git a/src/kits/media/MediaRecorder.cpp b/src/kits/media/MediaRecorder.cpp index 5738e936e3..665bbf0fbd 100644 --- a/src/kits/media/MediaRecorder.cpp +++ b/src/kits/media/MediaRecorder.cpp @@ -354,7 +354,7 @@ BMediaRecorder::Format() const status_t -BMediaRecorder::SetUpConnection(media_input ourInput, media_source outputSource) +BMediaRecorder::SetUpConnection(media_source outputSource) { fOutputSource = outputSource; diff --git a/src/kits/media/MediaRecorderNode.cpp b/src/kits/media/MediaRecorderNode.cpp index 87ef5278f2..6a7a3a53ca 100644 --- a/src/kits/media/MediaRecorderNode.cpp +++ b/src/kits/media/MediaRecorderNode.cpp @@ -301,11 +301,13 @@ BMediaRecorderNode::Connected(const media_source &producer, // so that our owner class can do it's operations. media_node node; BMediaRosterEx* roster = MediaRosterEx(BMediaRoster::CurrentRoster()); - roster->GetNodeFor(roster->NodeIDFor(producer.port), &node); + if (roster->GetNodeFor(roster->NodeIDFor(producer.port), &node) != B_OK) + return B_MEDIA_BAD_NODE; + fRecorder->fOutputNode = node; fRecorder->fReleaseOutputNode = true; - fRecorder->SetUpConnection(fInput, producer); + fRecorder->SetUpConnection(producer); fRecorder->fConnected = true; return B_OK;