From 7ee1c8269bd3d027c13f0f1c80d537a6b82ac709 Mon Sep 17 00:00:00 2001
From: Marcel van der Veldt <m.vanderveldt@outlook.com>
Date: Fri, 7 Jul 2023 01:04:23 +0200
Subject: [PATCH] Update frontend to handle some changes in the backend

---
 src/components/VolumeControl.vue                   |  2 +-
 .../default/PlayerOSD/PlayerTrackDetails.vue       |  2 +-
 src/plugins/api/interfaces.ts                      | 14 ++++++++++----
 src/utils.ts                                       |  6 +++---
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/components/VolumeControl.vue b/src/components/VolumeControl.vue
index 78202e07..2bfbb9b4 100644
--- a/src/components/VolumeControl.vue
+++ b/src/components/VolumeControl.vue
@@ -119,7 +119,7 @@ defineProps<Props>();
 
 const getVolumePlayers = function (player: Player) {
   const items: Player[] = [];
-  if (player.type != PlayerType.GROUP) {
+  if (player.type != PlayerType.GROUP && !player.group_childs.includes(player.player_id)) {
     items.push(player);
   }
   for (const groupChildId of player.group_childs) {
diff --git a/src/layouts/default/PlayerOSD/PlayerTrackDetails.vue b/src/layouts/default/PlayerOSD/PlayerTrackDetails.vue
index 76ea4c4b..fc499ab0 100644
--- a/src/layouts/default/PlayerOSD/PlayerTrackDetails.vue
+++ b/src/layouts/default/PlayerOSD/PlayerTrackDetails.vue
@@ -56,7 +56,7 @@
         v-bind="props"
       >
         <div class="d-flex justify-center" style="width: 100%">
-          {{ curQueueItem?.streamdetails.content_type.toUpperCase() }}
+          {{ curQueueItem?.streamdetails.audio_format.content_type.toUpperCase() }}
         </div>
       </v-chip>
     </template>
diff --git a/src/plugins/api/interfaces.ts b/src/plugins/api/interfaces.ts
index 97370079..d91d9fd0 100644
--- a/src/plugins/api/interfaces.ts
+++ b/src/plugins/api/interfaces.ts
@@ -463,14 +463,20 @@ export interface SearchResults {
   radio: Radio[];
 }
 
+export interface AudioFormat {
+    content_type: ContentType;
+    sample_rate: number;
+    bit_depth: number;
+    channels: number;
+    output_format_str: string;
+    bit_rate: number;
+}
+
 export interface StreamDetails {
   provider: string;
   item_id: string;
-  content_type: ContentType;
+  audio_format: AudioFormat;
   media_type: MediaType;
-  sample_rate: number;
-  bit_depth: number;
-  channels: number;
   stream_title?: string;
   duration?: number;
   size?: number;
diff --git a/src/utils.ts b/src/utils.ts
index ce435a6b..bd30662f 100644
--- a/src/utils.ts
+++ b/src/utils.ts
@@ -109,10 +109,10 @@ export const getBrowseFolderName = function (browseItem: BrowseFolder, t: any) {
 
 export const getPlayerName = function (player: Player, truncate = 26) {
   if (!player) return '';
-  if (player.type != PlayerType.GROUP && player.group_childs.length > 0) {
+  if (player.type != PlayerType.GROUP && player.group_childs.length > 1) {
     // create pretty name for syncgroup (e.g. playername +2)
-    // TODO: move to APi and only count available players
-    return `${truncateString(player.display_name, truncate - 3)} +${player.group_childs.length}`;
+    // TODO: move to API and only count available players
+    return `${truncateString(player.display_name, truncate - 3)} +${player.group_childs.length-1}`;
   }
   return truncateString(player.display_name, truncate);
 };