From eebedf8f1aafd7ffda157707f91b9cefdd700455 Mon Sep 17 00:00:00 2001 From: Dario Casalinuovo Date: Fri, 25 Nov 2016 00:26:02 +0100 Subject: [PATCH] MediaClient: Use unique id for both inputs and outputs --- headers/private/media/MediaClient.h | 3 +-- src/kits/media/MediaClient.cpp | 11 ++--------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/headers/private/media/MediaClient.h b/headers/private/media/MediaClient.h index 6d6f9b8d7a..1d950dd388 100755 --- a/headers/private/media/MediaClient.h +++ b/headers/private/media/MediaClient.h @@ -218,8 +218,7 @@ private: BObjectList fInputs; BObjectList fOutputs; - int32 fLastInputID; - int32 fLastOutputID; + media_connection_id fLastID; virtual void _ReservedMediaClient0(); virtual void _ReservedMediaClient1(); diff --git a/src/kits/media/MediaClient.cpp b/src/kits/media/MediaClient.cpp index 8b06b22366..10c02c0e4a 100755 --- a/src/kits/media/MediaClient.cpp +++ b/src/kits/media/MediaClient.cpp @@ -16,8 +16,7 @@ BMediaClient::BMediaClient(const char* name, media_type type, media_client_kind kind) : - fLastInputID(0), - fLastOutputID(0) + fLastID(0) { CALLED(); @@ -77,13 +76,7 @@ BMediaClient::BeginConnection(media_connection_kind kind) { CALLED(); - media_connection_id id; - if (kind == B_MEDIA_INPUT) - id = fLastInputID++; - else - id = fLastOutputID++; - - BMediaConnection* conn = new BMediaConnection(this, kind, id); + BMediaConnection* conn = new BMediaConnection(this, kind, fLastID++); AddConnection(conn); return conn; }