#180 - Add playlist shuffle mode to content player

PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/pad/PlaylistTabViewController.java

@@ -4,7 +4,6 @@ import de.thecodelabs.utils.application.system.NativeApplication;
 import de.thecodelabs.utils.ui.icon.FontAwesomeType;
 import de.thecodelabs.utils.ui.icon.FontIcon;
 import de.thecodelabs.utils.util.Localization;
-import de.tobias.playpad.PlayPad;
 import de.tobias.playpad.PlayPadPlugin;
 import de.tobias.playpad.Strings;
 import de.tobias.playpad.layout.desktop.listener.PadNewContentListener;
@@ -19,10 +18,7 @@ import javafx.beans.binding.Bindings;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.scene.Node;
-import javafx.scene.control.Button;
-import javafx.scene.control.Label;
-import javafx.scene.control.ListCell;
-import javafx.scene.control.ListView;
+import javafx.scene.control.*;
 import javafx.scene.layout.VBox;
 
 import java.io.File;
@@ -31,6 +27,9 @@ import java.util.List;
 
 public class PlaylistTabViewController extends PadSettingsTabViewController {
 
+	@FXML
+	private CheckBox shuffleCheckbox;
+
 	@FXML
 	private ListView<MediaPath> mediaPathListView;
 
@@ -123,12 +122,12 @@ public class PlaylistTabViewController extends PadSettingsTabViewController {
 
 	@Override
 	public void loadSettings(Pad pad) {
-		// Not implemented
+		shuffleCheckbox.setSelected((Boolean) pad.getPadSettings().getCustomSettings().getOrDefault(Playlistable.SHUFFLE_SETTINGS_KEY, false));
 	}
 
 	@Override
 	public void saveSettings(Pad pad) {
-		// Not implemented
+		pad.getPadSettings().getCustomSettings().put(Playlistable.SHUFFLE_SETTINGS_KEY, shuffleCheckbox.isSelected());
 	}
 
 	@FXML

PlayWall/src/main/resources/lang/ui_de.properties

@@ -137,6 +137,8 @@ padSettings.player.label.cueIn=Intro Dauer (in s):
 padSettings.player.label.fade=Ein-/Ausblenden:
 padSettings.layout.label.custom=Eigenes Layout:
 padSettings.layout.checkbox.custom=Aktiviert
+padSettings.playlist.settings.title=Allgemeine Einstellungen
+padSettings.playlist.settings.shuffle=Zuf\u00E4llige Wiedergabe
 project.label.details=Projektinformationen:
 project.label.name=Name:
 project.label.profile=Profil:

PlayWall/src/main/resources/view/option/pad/PlaylistTab.fxml

 <?xml version="1.0" encoding="UTF-8"?>
 
 <?import javafx.geometry.Insets?>
-<?import javafx.scene.control.*?>
-<?import javafx.scene.layout.*?>
-<HBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" spacing="14.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.CheckBox?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.ListView?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.VBox?>
+
+<VBox xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1">
+   <children>
+      <VBox spacing="14">
+         <children>
+            <Label styleClass="headline" text="%padSettings.playlist.settings.title" />
+            <CheckBox fx:id="shuffleCheckbox" mnemonicParsing="false" text="%padSettings.playlist.settings.shuffle" />
+         </children>
+         <VBox.margin>
+            <Insets />
+         </VBox.margin>
+         <padding>
+            <Insets bottom="14.0" left="14.0" right="14.0" top="14.0" />
+         </padding>
+      </VBox>
+      <HBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" spacing="14.0">
           <children>
               <VBox spacing="14.0">
                   <children>
@@ -44,3 +63,5 @@
               <Insets bottom="14.0" left="14.0" right="14.0" top="14.0" />
           </padding>
       </HBox>
+   </children>
+</VBox>

PlayWallCore/src/main/java/de/tobias/playpad/pad/content/Playlistable.java

@@ -4,6 +4,9 @@ import de.tobias.playpad.pad.mediapath.MediaPath;
 import javafx.beans.property.IntegerProperty;
 
 public interface Playlistable {
+
+	String SHUFFLE_SETTINGS_KEY = "shuffle";
+
 	int getCurrentPlayingMediaIndex();
 
 	IntegerProperty currentPlayingMediaIndexProperty();

PlayWallPlugins/PlayWallPluginContentPlayer/src/main/scala/de/tobias/playpad/plugin/content/pad/ContentPlayerMediaContainer.scala

@@ -8,7 +8,7 @@ import de.tobias.playpad.plugin.content.util._
 import javafx.beans.property.{ObjectProperty, ReadOnlyObjectProperty, SimpleObjectProperty}
 import javafx.util.Duration
 
-import java.nio.file.Files
+import java.nio.file.{Files, Path}
 
 class ContentPlayerMediaContainer(val content: ContentPlayerPadContent, private[pad] val mediaPath: MediaPath, val totalDuration: Duration) {
 
@@ -16,17 +16,17 @@ class ContentPlayerMediaContainer(val content: ContentPlayerPadContent, private[
 
 	_totalDurationProperty.set(totalDuration)
 
-	def getPath: String = {
+	def getPath: Path = {
 		val sourcePath = mediaPath.getPath.toAbsolutePath
 
 		val globalSettings = PlayPadPlugin.getInstance.getGlobalSettings
 		val convertPath = globalSettings.getCachePath.resolve(sourcePath.getFileName + ".mp4")
 
 		if (Files.exists(convertPath)) {
-			return convertPath.toString
+			return convertPath
 		}
 
-		sourcePath.toString
+		sourcePath
 	}
 
 	def getTotalDuration: Duration = _totalDurationProperty.get()

PlayWallPlugins/PlayWallPluginContentPlayer/src/main/scala/de/tobias/playpad/plugin/content/pad/ContentPlayerPadContent.scala

@@ -20,7 +20,7 @@ import nativecontentplayerwindows.ContentPlayer
 
 import java.nio.file.Files
 import java.util
-import java.util.UUID
+import java.util.{Collections, UUID}
 import java.util.stream.Collectors
 import scala.jdk.CollectionConverters._
 
@@ -61,6 +61,9 @@ class ContentPlayerPadContent(val pad: Pad, val `type`: String) extends PadConte
 		if (isPause) {
 			mediaPlayers(getCurrentPlayingMediaIndex).resume(withFadeIn)
 		} else {
+			if (isShuffle) {
+				Collections.shuffle(mediaPlayers)
+			}
 			getPad.setEof(false)
 			mediaPlayers.head.play(withFadeIn)
 		}
@@ -296,6 +299,10 @@ class ContentPlayerPadContent(val pad: Pad, val `type`: String) extends PadConte
 		pad.getPadSettings.getCustomSettings.getOrDefault(ContentPlayerPadContentFactory.lastFrame, false).asInstanceOf[Boolean]
 	}
 
+	def isShuffle: Boolean = {
+		pad.getPadSettings.getCustomSettings.getOrDefault(Playlistable.SHUFFLE_SETTINGS_KEY, false).asInstanceOf[Boolean]
+	}
+
 	def getSelectedZones: Seq[Zone] = {
 		val zoneConfiguration = Profile.currentProfile().getCustomSettings(ContentPluginMain.zoneConfigurationKey).asInstanceOf[ContentPlayerPluginConfiguration]
 

PlayWallPlugins/PlayWallPluginContentPlayer/src/main/scala/de/tobias/playpad/plugin/content/pad/ContentPlayerPadPreview.scala

@@ -43,7 +43,8 @@ class ContentPlayerPadPreview(pad: Pad, parent: Pane) extends VBox with IPadCont
 	pad.getContent match {
 		case content: ContentPlayerPadContent =>
 			subTitleLabel.textProperty().bind(Bindings.createStringBinding(() => {
-				if (content.getCurrentPlayingMediaIndex < 0) "" else PathUtils.getFilenameWithoutExtension(pad.getPaths.get(content.getCurrentPlayingMediaIndex).getPath.getFileName)
+				if (content.getCurrentPlayingMediaIndex < 0) ""
+				else PathUtils.getFilenameWithoutExtension(content.getMediaContainers.get(content.getCurrentPlayingMediaIndex).getPath.getFileName)
 			}, content.currentPlayingMediaIndexProperty()))
 		case _ =>
 	}

PlayWallPlugins/PlayWallPluginContentPlayer/src/main/scala/de/tobias/playpad/plugin/content/player/ContentPlayerBinding.scala

@@ -51,7 +51,7 @@ class ContentPlayerBinding(val nativePlayer: ContentPlayer, val zone: Zone) {
 				currentMedia.get().content.getPad.stop()
 			}
 		}
-		nativePlayer.Play(media.getPath, withFadeIn)
+		nativePlayer.Play(media.getPath.toString, withFadeIn)
 		currentMedia.set(media)
 	}