Remove debug flag, remove manual vol delta stuff

Author: SteveMicroNova

amplipi/streams/airplay.py

@@ -130,7 +130,7 @@ def _activate(self, vsrc: int):
       self.mpris = MPRIS(mpris_name, f'{src_config_folder}/metadata.txt')
 
       vol_sync = f"{utils.get_folder('streams')}/shairport_volume_handler.py"
-      vol_args = [sys.executable, vol_sync, mpris_name, str(self.id), "--debug"]
+      vol_args = [sys.executable, vol_sync, mpris_name, str(self.id)]
       logger.info(f'{self.name}: starting vol synchronizer: {vol_args}')
       self.volume_process = subprocess.Popen(args=vol_args, stdout=self._log_file, stderr=self._log_file)
     except Exception as exc:

streams/shairport_volume_handler.py

@@ -25,29 +25,27 @@ def __init__(self, service_suffix: str):
       interface_name="org.mpris.MediaPlayer2.Player"
     )
     super().__init__()
-    self.delta = 0.0
 
   async def watch_vol(self):
     """Watch the shairport mpris stream for volume changes and update amplipi volume info accordingly"""
     while True:
       try:
         if self.volume is not None and self.volume != self.mpris.Volume:
           self.logger.debug(f"Airplay volume changed from {self.volume} to {self.mpris.Volume}")
-          self.delta += self.mpris.Volume - self.volume
           self.callback("stream_volume_changed")
         self.volume = float(self.mpris.Volume)
 
       except Exception as e:
         self.logger.exception(f"Error: {e}")
         return
-      sleep(1)
+      sleep(0.1)
 
   def set_vol(self, amplipi_volume: float, vol_set_point: float) -> float:  # This has unused variable vol_set_point to keep up with the underlying StreamData.set_vol function schema
     """Update Airplay's volume slider to match AmpliPi"""
     try:
       # Airplay does not allow external devices to set the volume of a users system
 
-      # Airplay no longer relies on the set point vol, but if we ever get rid of the self.delta path of the stream_volume_changed event this will be relevant again:
+      # Airplay is a fully authoritative volume source, meaning it forces amplipi volume to equal its volume now. If that ever changes, this will be relevant:
         # There are two values this could realistically be returned and become the new vol_set_point, and they each have their own drawbacks:
 
         # amplipi_volume: If amplipi_volume is the new set point, any changes to airplay volume will send the volume to an odd

streams/volume_synchronizer.py

@@ -17,7 +17,6 @@ def __init__(self):
     self.callback: Callable
 
     self.volume: float = None
-    self.delta: Optional[float] = None
     self.logger: logging.Logger
 
     self.thread: threading.Thread = threading.Thread(target=self.run_async_watch, daemon=True).start()
@@ -88,11 +87,11 @@ def set_vol(self, stream_volume: float, vol_set_point: float):
       if stream_volume is None:
         return vol_set_point
 
-      if abs(stream_volume - vol_set_point) <= 0.005:
+      if abs(stream_volume - self.volume) <= 0.005:
         self.logger.debug("Ignored minor Stream -> AmpliPi change")
         return vol_set_point
 
-      delta = float(stream_volume - vol_set_point)
+      delta = float(stream_volume - self.volume)
       return self.set_vol_delta(delta)
     except Exception as e:
       self.logger.exception(f"Exception: {e}")
@@ -145,13 +144,7 @@ def watcher_loop(self):
       try:
         event = self.event_queue.get()
         if event == "stream_volume_changed":
-          if self.stream.delta is not None:
-            # Reduce race condition potential by decoupling the value from the variable
-            delta = float(self.stream.delta)
-            self.vol_set_point = self.amplipi.set_vol_delta(delta)
-            self.stream.delta -= delta
-          else:
-            self.vol_set_point = self.amplipi.set_vol(self.stream.volume, self.vol_set_point)
+          self.vol_set_point = self.amplipi.set_vol(self.stream.volume, self.vol_set_point)
         elif event == "amplipi_volume_changed":
           self.vol_set_point = self.stream.set_vol(self.amplipi.volume, self.vol_set_point)
       except queue.Empty: