From 3a652d778e377538e9c4f740f61ffb96729733e1 Mon Sep 17 00:00:00 2001
From: tobias <thinkdifferent055@gmail.com>
Date: Mon, 30 Nov 2020 19:24:21 +0100
Subject: [PATCH] By default all zones are active
---
.../plugin/content/pad/ContentPlayerPadContent.scala | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/PlayWallPlugins/PlayWallPluginContentPlayer/src/main/scala/de/tobias/playpad/plugin/content/pad/ContentPlayerPadContent.scala b/PlayWallPlugins/PlayWallPluginContentPlayer/src/main/scala/de/tobias/playpad/plugin/content/pad/ContentPlayerPadContent.scala
index 0618a946..2a4248de 100644
--- a/PlayWallPlugins/PlayWallPluginContentPlayer/src/main/scala/de/tobias/playpad/plugin/content/pad/ContentPlayerPadContent.scala
+++ b/PlayWallPlugins/PlayWallPluginContentPlayer/src/main/scala/de/tobias/playpad/plugin/content/pad/ContentPlayerPadContent.scala
@@ -2,6 +2,7 @@ package de.tobias.playpad.plugin.content.pad
import java.nio.file.Files
import java.util
+import java.util.stream.Collectors
import de.tobias.playpad.pad.content.play.{Durationable, Pauseable}
import de.tobias.playpad.pad.content.{PadContent, Playlistable}
@@ -291,7 +292,10 @@ class ContentPlayerPadContent(val pad: Pad, val `type`: String) extends PadConte
def getSelectedZones: Seq[PlayerInstance] = {
val customSettings = pad.getPadSettings.getCustomSettings
- val selectedZoneNames = customSettings.getOrDefault(ContentPlayerPadContentFactory.zones, new util.ArrayList[String]()).asInstanceOf[util.List[PlayerInstance]]
+ val selectedZoneNames = customSettings.getOrDefault(
+ ContentPlayerPadContentFactory.zones,
+ ContentPluginMain.configuration.instances.stream().map(zone => zone.getName).collect(Collectors.toList())
+ ).asInstanceOf[util.List[String]]
ContentPluginMain.configuration.instances.asScala.filter(zone => selectedZoneNames.contains(zone.getName)).toSeq
}
}
--
GitLab