Move all group vol buffer stuff to the frontend

Author: SteveMicroNova

amplipi/models.py

@@ -87,7 +87,7 @@ class fields(SimpleNamespace):
   VolumeMax = Field(ge=MIN_VOL_DB, le=MAX_VOL_DB, description='Max output volume in dB')
   GroupMute = Field(description='Set to true if output is all zones muted')
   GroupVolume = Field(ge=MIN_VOL_DB, le=MAX_VOL_DB, description='Average output volume')
-  GroupVolumeF = Field(ge=MIN_VOL_F, le=MAX_VOL_F, description='Average output volume as a floating-point number. Larger than zone vol_f due to also encompassing a zones vol_f_buffer.')
+  GroupVolumeF = Field(ge=MIN_VOL_F, le=MAX_VOL_F, description='Average output volume as a floating-point number.')
   Disabled = Field(description='Set to true if not connected to a speaker')
   Zones = Field(description='Set of zone ids belonging to a group')
   Groups = Field(description='List of group ids')

web/src/components/GroupVolumeSlider/GroupVolumeSlider.jsx

@@ -16,10 +16,22 @@ let sendingRequestCount = 0;
 // volume slider for a group in the volumes drawer
 const GroupVolumeSlider = ({ groupId, sourceId, groupsLeft }) => {
     const group = useStatusStore(s => s.status.groups.filter(g => g.id === groupId)[0]);
+    const zones = useStatusStore(s => s.status.zones);
     const setGroupVol = useStatusStore(s => s.setGroupVol);
     const setGroupMute = useStatusStore(s => s.setGroupMute);
     const [slidersOpen, setSlidersOpen] = React.useState(false);
 
+    const getVolume = () => { // Make sure group sliders account for vol_f_buffer
+        let v = 0;
+        for(let i = 0; i < group.zones.length; i++){
+            console.log(i, zones[group.zones[i]].vol_f + zones[group.zones[i]].vol_f_buffer);
+            v += (zones[group.zones[i]].vol_f + zones[group.zones[i]].vol_f_buffer);
+        }
+
+        return v / group.zones.length;
+    };
+    const volume = getVolume();
+
     // get zones for this group
     const groupZones = getSourceZones(sourceId, useStatusStore(s => s.status.zones)).filter(z => group.zones.includes(z.id));
 
@@ -77,7 +89,7 @@ const GroupVolumeSlider = ({ groupId, sourceId, groupsLeft }) => {
                     <VolumeSlider
                         mute={group.mute}
                         setMute={setMute}
-                        vol={group.vol_f}
+                        vol={volume}
                         setVol={setVol}
                     />
                 </div>