Pass a fully formed object to VolumeSynchronizer instead of the constructor and the kwargs, update documentation

Author: SteveMicroNova

streams/spotify_volume_handler.py

@@ -25,7 +25,7 @@ def __init__(self, api_port: int):
     super().__init__()
 
   async def watch_vol(self):
-    """Watch the go-librespot websocket endpoint for volume change events and update local volume info accordingly"""
+    """Watch the go-librespot websocket endpoint for volume change events and update AmpliPi volume info accordingly"""
     try:
       # Connect to the websocket and listen for state changes
       # pylint: disable=E1101
@@ -81,5 +81,5 @@ def set_vol(self, amplipi_volume: float, shared_volume: float) -> float:
 
   args = parser.parse_args()
 
-  handler = VolumeSynchronizer(SpotifyData, {"api_port": args.port}, args.stream_id, args.debug)
+  handler = VolumeSynchronizer(SpotifyData(api_port=args.port), args.stream_id, args.debug)
   handler.watcher_loop()

streams/volume_synchronizer.py

@@ -110,7 +110,7 @@ def set_vol(self, stream_volume: float, vol_set_point: float):
 class VolumeSynchronizer:
   """Volume synchronizer for AmpliPi and another volume-providing stream"""
 
-  def __init__(self, stream: StreamData, stream_kwargs: dict, stream_id: int, debug=False):
+  def __init__(self, stream: StreamData, stream_id: int, debug=False):
 
     self.logger = logging.getLogger(__name__)
     self.logger.setLevel(logging.DEBUG if debug else logging.WARNING)
@@ -120,7 +120,7 @@ def __init__(self, stream: StreamData, stream_kwargs: dict, stream_id: int, debu
     self.event_queue = queue.Queue()
     self.amplipi = AmpliPiData(stream_id, self.on_child_event, self.logger)
 
-    self.stream: StreamData = stream(**stream_kwargs)
+    self.stream: StreamData = stream
 
     # Set these directly so children don't need to add them to their constructors
     self.stream.logger = self.logger