lighter cmd read ins :)

yuannan · Feb 19, 2021 · b56cda2 · b56cda2
1 parent 1eeaf6c
commit b56cda2
Showing 1 changed file with 6 additions and 13 deletions.
diff --git a/panon/backend/source.py b/panon/backend/source.py
@@ -116,20 +116,13 @@ def update_smart_device(self, ):
         if not self.device_id == 'smart':
             return
         import subprocess
-        s = subprocess.run(['pacmd', 'list-sink-inputs'], capture_output=True).stdout
-        l = s.decode(errors='ignore').split('\n')
-        name = None
-        for line in l:
-            if line.startswith('\tstate: '):
-                state = line.split()[-1]
-            if line.startswith('\tsink: '):
-                if state == 'RUNNING':
-                    name = line.split('<')[-1][:-1]
-                    break
+        s = subprocess.run(['pactl', 'list', 'sink-inputs', 'short'], capture_output=True).stdout
+        l = s.decode(errors='ignore').split('\t')
+        new_id = l[1]
 
         if name is not None:
-            if not self.smart_device_id == name:
-                self.smart_device_id = name
+            if not self.smart_device_id == new_id:
+                self.smart_device_id = new_id
                 for stream in self.streams:
                     stream.__exit__(None, None, None)
 
@@ -139,7 +132,7 @@ def update_smart_device(self, ):
                 except (AttributeError, NotImplementedError):
                     pass
                 mic = sc.get_microphone(
-                    self.smart_device_id + '.monitor',
+                    self.smart_device_id,
                     include_loopback=False,
                     exclude_monitors=False,
                 )