From 7ca6717ff935549ac347d743e88ac47c2573d84f Mon Sep 17 00:00:00 2001
From: George Kiagiadakis <george.kiagiadakis@collabora.com>
Date: Fri, 5 Feb 2021 11:58:53 +0200
Subject: [PATCH] create-endpoint.lua: fix some issues

---
 src/scripts/create-endpoint.lua | 40 +++++++++++++--------------------
 1 file changed, 16 insertions(+), 24 deletions(-)

diff --git a/src/scripts/create-endpoint.lua b/src/scripts/create-endpoint.lua
index 25d1592e..dc1a58c6 100644
--- a/src/scripts/create-endpoint.lua
+++ b/src/scripts/create-endpoint.lua
@@ -47,31 +47,34 @@ function addEndpoint (node, session_name, endpoint_type, priority)
 
   -- activate endpoint
   session_items.endpoints[id]:activate (function (activated_ep)
-    Log.debug(node, "activated endpoint " .. name);
+    Log.debug(activated_ep, "activated endpoint " .. name);
 
     -- export endpoint
     activated_ep:export (session, function (exported_ep)
-      Log.info(node, "exported endpoint " .. name);
+      Log.info(exported_ep, "exported endpoint " .. name);
 
-      -- only use monitor for input endpoints
-      if string.find (media_class, "Input") or string.find (media_class, "Sink") then
+      -- only use monitor audio sinks
+      if media_class == "Audio/Sink" then
         -- create monitor
-        session_items.monitors[id] = SessionItem ( "si-monitor-endpoint" )
+        local monitor = SessionItem ( "si-monitor-endpoint" )
 
         -- configure monitor
-        if not session_items.monitors[id]:configure ({
+        if not monitor:configure ({
             "adapter", session_items.endpoints[id]
           }) then
-          Log.warning(node, "failed to configure monitor " .. name);
+          Log.warning(monitor, "failed to configure monitor " .. name);
+          return
         end
 
+        session_items.monitors[id] = monitor
+
         -- activate monitor
-        session_items.monitors[id]:activate (function (activated_mon)
-          Log.debug(node, "activated monitor " .. name);
+        monitor:activate (function (activated_mon)
+          Log.debug(activated_mon, "activated monitor " .. name);
 
           -- export monitor
           activated_mon:export (session, function (exported_mon)
-            Log.info(node, "exported monitor " .. name);
+            Log.info(exported_mon, "exported monitor " .. name);
           end)
         end)
       end
@@ -79,12 +82,6 @@ function addEndpoint (node, session_name, endpoint_type, priority)
   end)
 end
 
-function removeEndpoint (node)
-  local id = node["bound-id"]
-  session_items.monitors[id] = nil
-  session_items.endpoints[id] = nil
-end
-
 sessions_om = ObjectManager { Interest { type = "session" } }
 nodes_om = ObjectManager { Interest { type = "node" } }
 
@@ -104,14 +101,9 @@ nodes_om:connect("object-added", function (om, node)
 end)
 
 nodes_om:connect("object-removed", function (om, node)
-  local media_class = node.properties['media.class']
-
-  -- skip nodes without media class
-  if media_class == nil then
-    return
-  end
-
-  removeEndpoint (node)
+  local id = node["bound-id"]
+  session_items.monitors[id] = nil
+  session_items.endpoints[id] = nil
 end)
 
 sessions_om:activate()