From 0cc5ecb8ca33fbf36595076935537c05e2c48736 Mon Sep 17 00:00:00 2001 From: Dario Casalinuovo Date: Thu, 13 Apr 2017 18:05:24 +0200 Subject: [PATCH] MediaClient: IDs should be signed integers * It's very important to use a negative value to identify non valid or uninitialized connections. Additionally, it's preferred to don't interfere with media_kit types as long as the framework use it in the backend. --- headers/private/media/experimental/MediaClientDefs.h | 5 +++-- src/kits/media/experimental/MediaClient.cpp | 2 +- src/kits/media/experimental/MediaConnection.cpp | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/headers/private/media/experimental/MediaClientDefs.h b/headers/private/media/experimental/MediaClientDefs.h index 37af1d6ec0..4265b53c7a 100644 --- a/headers/private/media/experimental/MediaClientDefs.h +++ b/headers/private/media/experimental/MediaClientDefs.h @@ -13,10 +13,11 @@ namespace BPrivate { namespace media { -typedef uint64 media_client_id; +typedef int64 media_client_id; +typedef int64 media_connection_id; + typedef uint64 media_client_kinds; typedef uint64 media_connection_kinds; -typedef uint64 media_connection_id; enum media_client_kind { diff --git a/src/kits/media/experimental/MediaClient.cpp b/src/kits/media/experimental/MediaClient.cpp index f8f03a23f8..b5c937e4fc 100755 --- a/src/kits/media/experimental/MediaClient.cpp +++ b/src/kits/media/experimental/MediaClient.cpp @@ -78,7 +78,7 @@ public: BMediaClient::BMediaClient(const char* name, media_type type, media_client_kinds kinds) : - fLastID(0) + fLastID(-1) { CALLED(); diff --git a/src/kits/media/experimental/MediaConnection.cpp b/src/kits/media/experimental/MediaConnection.cpp index 91b8bc5823..a16dfb7637 100644 --- a/src/kits/media/experimental/MediaConnection.cpp +++ b/src/kits/media/experimental/MediaConnection.cpp @@ -21,7 +21,7 @@ BMediaConnection::BMediaConnection(media_connection_kinds kinds) CALLED(); fConnection.kinds = kinds; - fConnection.id = 0; + fConnection.id = -1; //fConnection.client = media_client::null; }