Merge branch 'main' of https://github.com/music-assistant/frontend

Author: marcelveldt

src/assets/DSP.png

@@ -75,6 +75,42 @@
           />
           {{ loudness }}
         </div>
+
+        <!-- For now, a very simple DSP indicator -->
+        <div
+          v-if="dsp_state == DSPState.DISABLED_BY_UNSUPPORTED_GROUP"
+          style="height: 50px; display: flex; align-items: center"
+        >
+          <img
+            height="30"
+            width="50"
+            contain
+            src="@/assets/DSP_off.png"
+            :style="
+              $vuetify.theme.current.dark
+                ? 'object-fit: contain;'
+                : 'object-fit: contain;filter: invert(100%);'
+            "
+          />
+          {{ $t("dsp_disabled_by_unsupported_group") }}
+        </div>
+        <div
+          v-else-if="dsp_state == DSPState.ENABLED"
+          style="height: 50px; display: flex; align-items: center"
+        >
+          <img
+            height="30"
+            width="50"
+            contain
+            src="@/assets/DSP.png"
+            :style="
+              $vuetify.theme.current.dark
+                ? 'object-fit: contain;'
+                : 'object-fit: contain;filter: invert(100%);'
+            "
+          />
+          {{ $t("dsp_active") }}
+        </div>
       </v-list>
     </v-card>
   </v-menu>
@@ -85,7 +121,11 @@ import { computed } from "vue";
 import ProviderIcon from "@/components/ProviderIcon.vue";
 import api from "@/plugins/api";
 import { store } from "@/plugins/store";
-import { ContentType, VolumeNormalizationMode } from "@/plugins/api/interfaces";
+import {
+  ContentType,
+  DSPState,
+  VolumeNormalizationMode,
+} from "@/plugins/api/interfaces";
 import { $t } from "@/plugins/i18n";
 
 // computed properties
@@ -123,6 +163,20 @@ const loudness = computed(() => {
     return null;
   }
 });
+// This is tempoary until the details show the whole DSP pipeline
+const dsp_state = computed(() => {
+  const dsp = streamDetails.value?.dsp;
+  if (!dsp) return DSPState.DISABLED;
+  let at_least_one_working = Object.values(dsp).some(
+    (d) => d.state == DSPState.ENABLED,
+  );
+  let at_least_one_unsupported = Object.values(dsp).some(
+    (d) => d.state == DSPState.DISABLED_BY_UNSUPPORTED_GROUP,
+  );
+  if (at_least_one_unsupported) return DSPState.DISABLED_BY_UNSUPPORTED_GROUP;
+  else if (at_least_one_working) return DSPState.ENABLED;
+  else return DSPState.DISABLED;
+});
 const getContentTypeIcon = function (contentType: ContentType) {
   if (contentType == ContentType.AAC) return iconAac;
   if (contentType == ContentType.FLAC) return iconFlac;

src/assets/DSP_off.png

@@ -60,6 +60,26 @@ export interface DSPConfig {
   output_limiter: boolean;
 }
 
+// DSPDetails used in StreamDetails
+export enum DSPState {
+  ENABLED = "enabled",
+  DISABLED = "disabled",
+  DISABLED_BY_UNSUPPORTED_GROUP = "disabled_by_unsupported_group",
+}
+
+// This describes the DSP configuration as applied,
+// even when the DSP state is disabled. For example,
+// output_limiter can remain true while the DSP is disabled.
+// All filters in the list are guaranteed to be enabled.
+export interface DSPDetails {
+  state: DSPState;
+  is_leader: boolean;
+  input_gain: number;
+  filters: DSPFilter[];
+  output_gain: number;
+  output_limiter: boolean;
+}
+
 /// enums
 
 export enum MediaType {
@@ -612,6 +632,11 @@ export interface StreamDetails {
   prefer_album_loudness?: boolean;
   target_loudness?: number;
   volume_normalization_mode?: VolumeNormalizationMode;
+  // This contains the DSPDetails of all players in the group.
+  // In case of single player playback, dict will contain only one entry.
+  // The leader will have is_leader set to True.
+  // (keep in mind that PlayerGroups have no (explicit) leader!)
+  dsp?: Record<string, DSPDetails>;
 }
 
 // queue_item

src/components/QualityDetailsBtn.vue

@@ -606,5 +606,7 @@
     "loudness_measurement": "{0} LUFS",
     "loudness_measurement_album": "{0} LUFS (album)",
     "loudness_dynamic": "Dynamic volume normalization",
-    "loudness_fixed": "Fixed gain correction"
+    "loudness_fixed": "Fixed gain correction",
+    "dsp_disabled_by_unsupported_group": "Not supported for this group type",
+    "dsp_active": "Active"
 }