From 42727fcbc6ffcc89fe61fb43ee83ffd9acc84bf9 Mon Sep 17 00:00:00 2001
From: George Kiagiadakis <george.kiagiadakis@collabora.com>
Date: Mon, 24 Jun 2024 17:35:52 +0300
Subject: [PATCH] linking: move find-media-role-target hook to run later in the
 chain

A defined target should have priority over a role-based target
---
 src/scripts/linking/README.rst                 | 4 ++++
 src/scripts/linking/find-default-target.lua    | 2 +-
 src/scripts/linking/find-defined-target.lua    | 1 -
 src/scripts/linking/find-media-role-target.lua | 1 +
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/scripts/linking/README.rst b/src/scripts/linking/README.rst
index d53f7eaa..75684402 100644
--- a/src/scripts/linking/README.rst
+++ b/src/scripts/linking/README.rst
@@ -92,6 +92,10 @@ processed while targets are being selected.
      - find-filter-target.lua
      - Select the target of a filter node, if the subject is a filter node
 
+   * - linking/find-media-role-target
+     - find-media-role-target.lua
+     - Select the target based on the stream's media.role and the target's device.intended-roles
+
    * - linking/find-default-target
      - find-default-target.lua
      - Select the default source/sink as target
diff --git a/src/scripts/linking/find-default-target.lua b/src/scripts/linking/find-default-target.lua
index ac0cf657..eba3fc31 100644
--- a/src/scripts/linking/find-default-target.lua
+++ b/src/scripts/linking/find-default-target.lua
@@ -11,7 +11,7 @@ log = Log.open_topic ("s-linking")
 
 SimpleEventHook {
   name = "linking/find-default-target",
-  after = "linking/find-filter-target",
+  after = "linking/find-media-role-target",
   interests = {
     EventInterest {
       Constraint { "event.type", "=", "select-target" },
diff --git a/src/scripts/linking/find-defined-target.lua b/src/scripts/linking/find-defined-target.lua
index 8156c5a5..f027cf5b 100644
--- a/src/scripts/linking/find-defined-target.lua
+++ b/src/scripts/linking/find-defined-target.lua
@@ -15,7 +15,6 @@ log = Log.open_topic ("s-linking")
 
 SimpleEventHook {
   name = "linking/find-defined-target",
-  after = "linking/find-media-role-target",
   interests = {
     EventInterest {
       Constraint { "event.type", "=", "select-target" },
diff --git a/src/scripts/linking/find-media-role-target.lua b/src/scripts/linking/find-media-role-target.lua
index d91b5bc8..bdd6b023 100644
--- a/src/scripts/linking/find-media-role-target.lua
+++ b/src/scripts/linking/find-media-role-target.lua
@@ -12,6 +12,7 @@ log = Log.open_topic("s-linking")
 
 SimpleEventHook {
   name = "linking/find-media-role-target",
+  after = "linking/find-filter-target",
   interests = {
     EventInterest {
       Constraint { "event.type", "=", "select-target" },