From 1c15261f5aa8c6251d2e13def6be6244e65fdfc0 Mon Sep 17 00:00:00 2001
From: Barrett17 <b.vitruvio@gmail.com>
Date: Fri, 2 Mar 2018 03:18:26 +0100
Subject: [PATCH] MediaConnection: Add connection name handling

---
 .../media/experimental/MediaConnection.h      |  7 ++++---
 .../media/experimental/MediaClientDefs.cpp    |  2 ++
 .../media/experimental/MediaClientNode.cpp    |  2 +-
 .../media/experimental/MediaConnection.cpp    | 20 ++++++++++++++-----
 4 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/headers/private/media/experimental/MediaConnection.h b/headers/private/media/experimental/MediaConnection.h
index 82133dc392..73dd7c57a5 100644
--- a/headers/private/media/experimental/MediaConnection.h
+++ b/headers/private/media/experimental/MediaConnection.h
@@ -67,7 +67,8 @@ public:
 
 protected:
 									BMediaConnection(
-										media_connection_kinds kinds);
+										media_connection_kinds kinds,
+										const char* name = NULL);
 	virtual							~BMediaConnection();
 
 private:
@@ -115,7 +116,7 @@ private:
 
 class BMediaInput : public virtual BMediaConnection {
 protected:
-									BMediaInput();
+									BMediaInput(const char* name = NULL);
 	virtual							~BMediaInput();
 
 	// Callbacks
@@ -147,7 +148,7 @@ private:
 
 class BMediaOutput : public virtual BMediaConnection {
 protected:
-									BMediaOutput();
+									BMediaOutput(const char* name = NULL);
 	virtual							~BMediaOutput();
 
 	// Callbacks
diff --git a/src/kits/media/experimental/MediaClientDefs.cpp b/src/kits/media/experimental/MediaClientDefs.cpp
index 01de742b70..28ae1c84b8 100644
--- a/src/kits/media/experimental/MediaClientDefs.cpp
+++ b/src/kits/media/experimental/MediaClientDefs.cpp
@@ -66,6 +66,7 @@ media_connection::_BuildMediaInput() const
 	input.source = source;
 	input.destination = destination;
 	input.format = format;
+	strcpy(input.name, name);
 	return input;
 }
 
@@ -78,6 +79,7 @@ media_connection::_BuildMediaOutput() const
 	output.source = source;
 	output.destination = destination;
 	output.format = format;
+	strcpy(output.name, name);
 	return output;
 }
 
diff --git a/src/kits/media/experimental/MediaClientNode.cpp b/src/kits/media/experimental/MediaClientNode.cpp
index 971e7cb4b7..51629df6fb 100755
--- a/src/kits/media/experimental/MediaClientNode.cpp
+++ b/src/kits/media/experimental/MediaClientNode.cpp
@@ -400,7 +400,7 @@ BMediaClientNode::PrepareToConnect(const media_source& source,
 		return err;
 
 	*out_source = conn->_Source();
-	strcpy(name, Name());
+	strcpy(name, conn->Name());
 
 	return B_OK;
 }
diff --git a/src/kits/media/experimental/MediaConnection.cpp b/src/kits/media/experimental/MediaConnection.cpp
index 5d667fb4e0..b0e7ce6801 100644
--- a/src/kits/media/experimental/MediaConnection.cpp
+++ b/src/kits/media/experimental/MediaConnection.cpp
@@ -10,7 +10,8 @@
 #include "debug.h"
 
 
-BMediaConnection::BMediaConnection(media_connection_kinds kinds)
+BMediaConnection::BMediaConnection(media_connection_kinds kinds,
+	const char* name)
 	:
 	fOwner(NULL),
 	fBind(NULL)
@@ -20,6 +21,8 @@ BMediaConnection::BMediaConnection(media_connection_kinds kinds)
 	fConnection.kinds = kinds;
 	fConnection.id = -1;
 	//fConnection.client = media_client::null;
+	if (name != NULL)
+		strcpy(fConnection.name, name);
 }
 
 
@@ -44,6 +47,13 @@ BMediaConnection::Client() const
 }
 
 
+const char*
+BMediaConnection::Name() const
+{
+	return fConnection.name;
+}
+
+
 bool
 BMediaConnection::HasBinding() const
 {
@@ -160,9 +170,9 @@ void BMediaConnection::_ReservedMediaConnection9() {}
 void BMediaConnection::_ReservedMediaConnection10() {}
 
 
-BMediaInput::BMediaInput()
+BMediaInput::BMediaInput(const char* name)
 	:
-	BMediaConnection(B_MEDIA_INPUT)
+	BMediaConnection(B_MEDIA_INPUT, name)
 {
 }
 
@@ -207,9 +217,9 @@ void BMediaInput::_ReservedMediaInput9() {}
 void BMediaInput::_ReservedMediaInput10() {}
 
 
-BMediaOutput::BMediaOutput()
+BMediaOutput::BMediaOutput(const char* name)
 	:
-	BMediaConnection(B_MEDIA_OUTPUT),
+	BMediaConnection(B_MEDIA_OUTPUT, name),
 	fBufferGroup(NULL)
 {
 }