Remove rebase artifacts

Author: SteveMicroNova

amplipi/streams/spotify_connect.py

@@ -141,8 +141,6 @@ def _deactivate(self):
       logger.info(f'{self.name}: stopping player')
 
       self.proc.terminate()
-      self.proc2.terminate()
-      self.proc3.terminate()
       if self.proc.wait(1) != 0:
         logger.info(f'{self.name}: killing player')
         self.proc.kill()
@@ -153,10 +151,6 @@ def _deactivate(self):
         logger.info(f'{self.name}: killing metadata reader')
         self.proc2.kill()
       self.proc2.communicate()
-      if self.proc3.wait(1) != 0:
-        logger.info(f'{self.name}: killing volume synchronizer')
-        self.proc3.kill()
-      self.proc3.communicate()
 
       if self.volume_sync_process:
         self.volume_sync_process.terminate()
@@ -178,7 +172,6 @@ def _deactivate(self):
     self._disconnect()
     self.proc = None
     self.proc2 = None
-    self.proc3 = None
 
   def info(self) -> models.SourceInfo:
     source = models.SourceInfo(

streams/spotify_volume_handler.py

@@ -7,7 +7,7 @@
 import websockets
 import requests
 
-from volume_synchronizer import VolumeSynchronizer, StreamData
+from volume_synchronizer import VolumeSynchronizer, StreamData, VolEvents
 from spot_connect_meta import Event
 
 
@@ -21,8 +21,9 @@ class SpotifyData(StreamData):
   """A class that watches and tracks changes to spotify-side volume"""
 
   def __init__(self, api_port: int):
-    self.api_port: int = api_port
     super().__init__()
+    self.api_port: int = api_port
+    """What port is go-librespot running on? Typically set to 3678 + vsrc."""
 
   async def watch_vol(self):
     """Watch the go-librespot websocket endpoint for volume change events and update AmpliPi volume info accordingly"""
@@ -37,13 +38,13 @@ async def watch_vol(self):
             event = Event.from_json(json.loads(msg))
             if event.event_type == "volume":
               last_volume = float(self.volume) if self.volume is not None else None
-              self.volume = event.data.value / 100  # AmpliPi volume is between 0 and 1, Spotify is between 0 and 100. Dividing by 100 is more accurate than multiplying by 100 due to floating point errors.
+              self.volume = event.data.value / 100  # Translate spotify volume (0 - 100) to amplipi volume (0 - 1)
 
               self.logger.debug(f"Spotify volume changed from {last_volume} to {self.volume}")
               if last_volume is not None and self.volume != last_volume:
-                self.callback("stream_volume_changed")
+                self.schedule_event(VolEvents.CHANGE_AMPLIPI)
             elif event.event_type == "will_play" and self.volume is None:
-              self.callback("amplipi_volume_changed")  # Intercept the event that occurs when a song starts playing and use that as a trigger for the initial state sync
+              self.schedule_event(VolEvents.CHANGE_STREAM)  # Intercept the event that occurs when a song starts playing and use that as a trigger for the initial state sync
 
           except Exception as e:
             self.logger.exception(f"Error: {e}")
@@ -76,7 +77,6 @@ def set_vol(self, amplipi_volume: float, shared_volume: float) -> float:
   parser = argparse.ArgumentParser(description="Read metadata from a given URL and write it to a file.")
 
   parser.add_argument("port", help="port that go-librespot is running on", type=int)
-  parser.add_argument("stream_id", help="The stream's amplipi side stream_id", type=int)
   parser.add_argument("config_dir", help="The directory of the vsrc config", type=str)
   parser.add_argument("--debug", action="store_true", help="Change log level from WARNING to DEBUG")