Merge pull request #1 from glmnet/windows-volume-control

windows set volume by pid

Author: TheSpookyCat

ap2-receiver.py

@@ -20,7 +20,7 @@
 
 from ap2.connections.audio import RTPBuffer
 from ap2.playfair import PlayFair
-from ap2.utils import get_volume, set_volume
+from ap2.utils import get_volume, set_volume, set_volume_pid
 from ap2.pairing.hap import Hap, HAPSocket
 from ap2.connections.event import Event
 from ap2.connections.stream import Stream
@@ -401,6 +401,7 @@ def do_SETUP(self):
                     print("Sending CONTROL/DATA:")
                     buff = 8388608  # determines how many CODEC frame size 1024 we can hold
                     stream = Stream(plist["streams"][0], buff)
+                    set_volume_pid(stream.data_proc.pid)
                     self.server.streams.append(stream)
                     sonos_one_setup_data["streams"][0]["controlPort"] = stream.control_port
                     sonos_one_setup_data["streams"][0]["dataPort"] = stream.data_port

ap2/utils.py

@@ -13,7 +13,7 @@
         ISimpleAudioVolume = None
         print('[!] Pycaw is not installed - volume control will be unavailable', )
 
-        
+
 def get_logger(name, level="INFO"):
     logging.basicConfig(
         filename="%s.log" % name,
@@ -55,21 +55,27 @@ def interpolate(value, from_min, from_max, to_min, to_max):
 
     return to_min + (value_scale * to_span)
 
-  
+
+audio_pid = 0
+
+def set_volume_pid(pid):
+    global audio_pid
+    audio_pid = pid
+
 def get_pycaw_volume_session():
     if platform.system() != 'Windows' or AudioUtilities is None:
         return
     session = None
     for s in AudioUtilities.GetAllSessions():
         try:
-            if s.Process.name() == 'python.exe':
+            if s.Process.pid == audio_pid:
                 session = s._ctl.QueryInterface(ISimpleAudioVolume)
                 break
         except AttributeError:
             pass
     return session
 
-  
+
 def get_volume():
     subsys = platform.system()
     if subsys == "Darwin":