# HG changeset patch
# User František Kučera <franta-hg@frantovo.cz>
# Date 1602690348 -7200
# Node ID 79520ded76f0f0724a75ea598be67939b522721a
# Parent  463ce61415f121c605523b5ef3a7df33f6c05800
fix bash-completion (uuid) + connect/disconnect error message (to/from)

diff -r 463ce61415f1 -r 79520ded76f0 bash-completion.sh
--- a/bash-completion.sh	Sun Oct 11 17:13:02 2020 +0200
+++ b/bash-completion.sh	Wed Oct 14 17:45:48 2020 +0200
@@ -19,7 +19,7 @@
 	if type relpipe-in-jack &> /dev/null && type relpipe-out-nullbyte &> /dev/null; then
 		relpipe-in-jack --list-ports true --list-midi-messages false 2>/dev/null \
 			| relpipe-out-nullbyte \
-			| while _relpipe_in_jack_completion_read_nullbyte "name" "input" "output" "physical" "terminal" "mine" "midi" "type"; do
+			| while _relpipe_in_jack_completion_read_nullbyte "name" "uuid" "input" "output" "physical" "terminal" "mine" "midi" "type"; do
 				 if [[ "$midi" = "true" && "${!1}" = "true" && "$mine" = "false" ]]; then echo "$name"; fi; done
 	fi
 }
diff -r 463ce61415f1 -r 79520ded76f0 src/JackCommand.h
--- a/src/JackCommand.h	Sun Oct 11 17:13:02 2020 +0200
+++ b/src/JackCommand.h	Wed Oct 14 17:45:48 2020 +0200
@@ -290,7 +290,7 @@
 		for (Configuration::ConnectionRecipe recipe : configuration.connectionRecipes) {
 			auto operation = recipe.connected ? jack_connect : jack_disconnect;
 			int result = operation(realTimeContext.jackClient, convertor.to_bytes(recipe.sourcePort).c_str(), convertor.to_bytes(recipe.destinationPort).c_str());
-			if (result != 0 && result != EEXIST) std::wcerr << L"Unable to " << (recipe.connected ? L"connect" : L"disconnect") << L": „" << recipe.sourcePort << L"“ to: „" << recipe.destinationPort << L"“." << std::endl;
+			if (result != 0 && result != EEXIST) std::wcerr << L"Unable to " << (recipe.connected ? L"connect" : L"disconnect") << L": „" << recipe.sourcePort << (recipe.connected ? L"“ to: „" : L"“ from: „") << recipe.destinationPort << L"“." << std::endl;
 		}
 	}