From c64359d455248c23d1436fa16e2ff7ced7605be6 Mon Sep 17 00:00:00 2001 From: 0xboobface <0xboobface@gmail.com> Date: Mon, 13 Aug 2018 18:27:23 +0200 Subject: [PATCH] Allow multiple player processes at once --- src/main/java/ctbrec/Settings.java | 2 ++ src/main/java/ctbrec/ui/Player.java | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/ctbrec/Settings.java b/src/main/java/ctbrec/Settings.java index 17dac090..80927af7 100644 --- a/src/main/java/ctbrec/Settings.java +++ b/src/main/java/ctbrec/Settings.java @@ -5,6 +5,7 @@ import java.util.ArrayList; import java.util.List; public class Settings { + public boolean singlePlayer = true; public boolean localRecording = true; public int httpPort = 8080; public int httpTimeout = 10; @@ -21,5 +22,6 @@ public class Settings { public boolean determineResolution = false; public boolean requireAuthentication = false; public boolean chooseStreamQuality = false; + public boolean recordFollowed = false; public byte[] key = null; } diff --git a/src/main/java/ctbrec/ui/Player.java b/src/main/java/ctbrec/ui/Player.java index cf805c63..8bcf772b 100644 --- a/src/main/java/ctbrec/ui/Player.java +++ b/src/main/java/ctbrec/ui/Player.java @@ -17,8 +17,9 @@ public class Player { private static PlayerThread playerThread; public static void play(String url) { + boolean singlePlayer = Config.getInstance().getSettings().singlePlayer; try { - if (playerThread != null && playerThread.isRunning()) { + if (singlePlayer && playerThread != null && playerThread.isRunning()) { playerThread.stopThread(); } @@ -29,8 +30,9 @@ public class Player { } public static void play(Recording rec) { + boolean singlePlayer = Config.getInstance().getSettings().singlePlayer; try { - if (playerThread != null && playerThread.isRunning()) { + if (singlePlayer && playerThread != null && playerThread.isRunning()) { playerThread.stopThread(); }