From 303485a315ee7ab84b672aaf9e2577bf2946142f Mon Sep 17 00:00:00 2001 From: 0xb00bface <0xboobface@gmail.com> Date: Sat, 13 Feb 2021 19:50:48 +0100 Subject: [PATCH] Introduce config setting for contact sheet timestamp style --- common/src/main/java/ctbrec/Settings.java | 1 + .../ctbrec/recorder/postprocessing/CreateContactSheet.java | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/common/src/main/java/ctbrec/Settings.java b/common/src/main/java/ctbrec/Settings.java index 9fb7a42a..ef2a7b79 100644 --- a/common/src/main/java/ctbrec/Settings.java +++ b/common/src/main/java/ctbrec/Settings.java @@ -56,6 +56,7 @@ public class Settings { public String colorBase = "#FFFFFF"; public int concurrentRecordings = 0; public boolean confirmationForDangerousActions = false; + public String contactsheetTimestampLook = "font=sans-serif:fontcolor=white:fontsize=60:box=1:boxcolor=black@0.5:boxborderw=5"; public boolean determineResolution = false; public List disabledSites = new ArrayList<>(); public String downloadFilename = "${modelSanitizedName}-${localDateTime}"; diff --git a/common/src/main/java/ctbrec/recorder/postprocessing/CreateContactSheet.java b/common/src/main/java/ctbrec/recorder/postprocessing/CreateContactSheet.java index fc85404f..5459dcdc 100644 --- a/common/src/main/java/ctbrec/recorder/postprocessing/CreateContactSheet.java +++ b/common/src/main/java/ctbrec/recorder/postprocessing/CreateContactSheet.java @@ -102,6 +102,7 @@ public class CreateContactSheet extends AbstractPlaceholderAwarePostProcessor { int numberOfThumbs = rows * cols; long lengthInSeconds = rec.getLength().getSeconds(); double thumbnailInterval = lengthInSeconds / (double)numberOfThumbs; + String timestampLook = config.getSettings().contactsheetTimestampLook; NumberFormat nf = new DecimalFormat("000"); for (int i = 0; i < numberOfThumbs; i++) { @@ -114,8 +115,7 @@ public class CreateContactSheet extends AbstractPlaceholderAwarePostProcessor { int minutes = (int) (startTimeInSeconds % 3600 / 60); int seconds = (int) (startTimeInSeconds % 60); String timestamp = String.format("%02d\\:%02d\\:%02d", hours, minutes, seconds); - videoFilter += ",drawtext='text=" + timestamp - + ":fontcolor=white:fontsize=48:box=1:boxcolor=black@0.5:boxborderw=5:x=(w-text_w-20):y=(h-text_h-20)'"; + videoFilter += ",drawtext='text=" + timestamp + ":" + timestampLook + ":x=(w-text_w-20):y=(h-text_h-20)'"; } File input = getInputFile(rec);