From 50377f2a706efa64bf754c757390114958055fed Mon Sep 17 00:00:00 2001
From: Ashok Sidipotu <ashok.sidipotu@collabora.com>
Date: Fri, 27 Jan 2023 07:39:12 +0530
Subject: [PATCH] default-nodes: make the default-config* keys trigger common

This trigger will be available all the time irrespective of whether persistant
option is enable or not.
---
 .../default-nodes/select-default-nodes.lua    |  7 +++++++
 .../default-nodes/state-default-nodes.lua     | 19 -------------------
 2 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/src/scripts/default-nodes/select-default-nodes.lua b/src/scripts/default-nodes/select-default-nodes.lua
index 92c62252..cfe78be0 100644
--- a/src/scripts/default-nodes/select-default-nodes.lua
+++ b/src/scripts/default-nodes/select-default-nodes.lua
@@ -17,6 +17,13 @@ SimpleEventHook {
       Constraint { "event.session-item.interface", "=", "linkable" },
       Constraint { "media.class", "#", "Video/*" },
     },
+    EventInterest {
+      Constraint { "event.type", "=", "metadata-changed" },
+      Constraint { "metadata.name", "=", "default" },
+      Constraint { "event.subject.key", "c", "default.configured.audio.sink",
+          "default.configured.audio.source", "default.configured.video.source"
+      },
+    },
   },
   execute = function (event)
     local source = event:get_source ()
diff --git a/src/scripts/default-nodes/state-default-nodes.lua b/src/scripts/default-nodes/state-default-nodes.lua
index c59fc5c4..3bae4e32 100644
--- a/src/scripts/default-nodes/state-default-nodes.lua
+++ b/src/scripts/default-nodes/state-default-nodes.lua
@@ -58,23 +58,6 @@ find_stored_default_node_hook = SimpleEventHook {
   end
 }
 
-rescan_trigger_hook = SimpleEventHook {
-  name = "default-nodes/rescan-trigger",
-  interests = {
-    EventInterest {
-      Constraint { "event.type", "=", "metadata-changed" },
-      Constraint { "metadata.name", "=", "default" },
-      Constraint { "event.subject.key", "c", "default.configured.audio.sink",
-          "default.configured.audio.source", "default.configured.video.source"
-      },
-    },
-  },
-  execute = function (event)
-    local source = event:get_source ()
-    source:call ("schedule-rescan", "default-nodes")
-  end
-}
-
 store_configured_default_nodes_hook = SimpleEventHook {
   name = "default-nodes/store-configured-default-nodes",
   interests = {
@@ -193,14 +176,12 @@ function handlePersistentSetting (enable)
     state = State ("default-nodes")
     state_table = state:load ()
     find_stored_default_node_hook:register ()
-    rescan_trigger_hook:register ()
     store_configured_default_nodes_hook:register ()
     metadata_added_hook:register ()
   elseif not enable and state then
     state = nil
     state_table = nil
     find_stored_default_node_hook:remove ()
-    rescan_trigger_hook:remove ()
     store_configured_default_nodes_hook:remove ()
     metadata_added_hook:remove ()
   end