Correct power output detail for the every channel used case

micro-nova · Jun 14, 2024 · 902ec5d · 902ec5d
1 parent 8ebbb99
commit 902ec5d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/docs/manual/MAIN_CONTROLLER_SPECS.md b/docs/manual/MAIN_CONTROLLER_SPECS.md
@@ -23,6 +23,7 @@
 |||
 |Speaker Power     | 55 WPC @ 4 Ω |
 |                  | 32 WPC @ 8 Ω |
+|                  | 23 RMS WPC power with all channels driven |
 |||
 |Speaker Impedance | 4 - 8 Ω |
 |||

diff --git a/web/src/components/StreamsModal/StreamsModal.jsx b/web/src/components/StreamsModal/StreamsModal.jsx
@@ -31,12 +31,16 @@ const StreamsModal = ({
 }) => {
     const streams = useStatusStore((state) => state.status.streams);
     const status = useStatusStore((state) => state.status);
+    const sources = useStatusStore((state) => state.sources);
+    const zones = useStatusStore((state) => state.zones);
 
     const setStream = (stream) => {
         const streamId = stream.id;
         let currentSourceId = sourceId;
         // RCA can only be used on its associated source, so swap if necessary
-        const moveSource = stream.type === "rca" && stream.index != sourceId;
+        // If the stream is already playing on a source, don't steal it; swap if necessary.
+        const moveSource = (stream.type === "rca" && stream.index != sourceId;) || 
+            (sources.some( (s) => s.input === `stream={streamId}` ));
         if (moveSource) {
             currentSourceId = stream.index;
             // notify ZonesModal that we are using a different sourceId