@@ -81,17 +81,17 @@ def get_vol(self):
8181 self .logger .warning ("Could not find any associated zones" )
8282 return 0
8383
84- def set_vol (self , stream_volume : float , shared_volume : float ):
84+ def set_vol (self , stream_volume : float , vol_set_point : float ):
8585 """Update AmpliPi's volume to match the stream volume"""
8686 try :
8787 if stream_volume is None :
88- return shared_volume
88+ return vol_set_point
8989
90- if abs (stream_volume - shared_volume ) <= 0.005 :
90+ if abs (stream_volume - vol_set_point ) <= 0.005 :
9191 self .logger .debug ("Ignored minor Stream -> AmpliPi change" )
92- return shared_volume
92+ return vol_set_point
9393
94- delta = float (stream_volume - shared_volume )
94+ delta = float (stream_volume - vol_set_point )
9595 expected_volume = self .volume + delta
9696 self .logger .debug (f"Setting AmpliPi volume to { expected_volume } from { self .volume } " )
9797 self .consume_status (requests .patch (
@@ -126,7 +126,7 @@ def __init__(self, stream: StreamData, stream_kwargs: dict, stream_id: int, debu
126126 self .stream .logger = self .logger
127127 self .stream .callback = self .on_child_event
128128
129- self .shared_volume = self .amplipi .get_vol ()
129+ self .vol_set_point = self .amplipi .get_vol ()
130130
131131 def on_child_event (self , event_type ):
132132 """When an event occurs in a child, that child can use this callback function to schedule the response to said event in the event queue"""
@@ -137,9 +137,9 @@ def watcher_loop(self):
137137 try :
138138 event = self .event_queue .get (timeout = 2 )
139139 if event == "stream_volume_changed" :
140- self .shared_volume = self .amplipi .set_vol (self .stream .volume , self .shared_volume )
140+ self .vol_set_point = self .amplipi .set_vol (self .stream .volume , self .vol_set_point )
141141 elif event == "amplipi_volume_changed" :
142- self .shared_volume = self .stream .set_vol (self .amplipi .volume , self .shared_volume )
142+ self .vol_set_point = self .stream .set_vol (self .amplipi .volume , self .vol_set_point )
143143 except queue .Empty :
144144 continue
145145 except (KeyboardInterrupt , SystemExit ):
0 commit comments