From 1028ef04ffe29fbbc8168ce47541b887caa12b9e Mon Sep 17 00:00:00 2001 From: Bert Frees Date: Wed, 24 Jan 2018 15:09:53 +0100 Subject: [PATCH] Make all Pipeline properties uniform i.e. make them all start with "org.daisy.pipeline". This includes the TTS properties, which now start with "org.daisy.pipeline.tts". see https://github.com/daisy/pipeline-assembly/issues/141 --- .../main/java/org/daisy/pipeline/audio/lame/LameEncoder.java | 4 ++-- .../src/test/java/org/daisy/pipeline/audio/lame/LameTest.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/audio-utils/audio-encoder-lame/src/main/java/org/daisy/pipeline/audio/lame/LameEncoder.java b/audio-utils/audio-encoder-lame/src/main/java/org/daisy/pipeline/audio/lame/LameEncoder.java index 741007f..4c10ea6 100644 --- a/audio-utils/audio-encoder-lame/src/main/java/org/daisy/pipeline/audio/lame/LameEncoder.java +++ b/audio-utils/audio-encoder-lame/src/main/java/org/daisy/pipeline/audio/lame/LameEncoder.java @@ -127,12 +127,12 @@ public EncodingOptions parseEncodingOptions(Map params) { LameEncodingOptions opts = new LameEncodingOptions(); opts.cliOptions = new String[0]; - String cliextra = params.get("lame.cli.options"); + String cliextra = params.get("org.daisy.pipeline.tts.lame.cli.options"); if (cliextra != null) { opts.cliOptions = cliextra.split(" "); } - String lamePathProp = "lame.path"; + String lamePathProp = "org.daisy.pipeline.tts.lame.path"; opts.binpath = params.get(lamePathProp); if (opts.binpath == null) { Optional lpath = BinaryFinder.find("lame"); diff --git a/audio-utils/audio-encoder-lame/src/test/java/org/daisy/pipeline/audio/lame/LameTest.java b/audio-utils/audio-encoder-lame/src/test/java/org/daisy/pipeline/audio/lame/LameTest.java index 7957674..7f81992 100644 --- a/audio-utils/audio-encoder-lame/src/test/java/org/daisy/pipeline/audio/lame/LameTest.java +++ b/audio-utils/audio-encoder-lame/src/test/java/org/daisy/pipeline/audio/lame/LameTest.java @@ -48,7 +48,7 @@ public AudioBufferTest(byte[] data, int size) { @Before public void cleanProperties() { - System.setProperty("host.protection", "true"); + System.setProperty("org.daisy.pipeline.tts.host.protection", "true"); } private static byte[] mp3ToPCM(AudioFormat originalFormat, String mp3File) @@ -185,7 +185,7 @@ private boolean isValid(AudioFormat sourceFormat) throws Throwable { @Test public void noHostProtection() throws Throwable { - System.setProperty("host.protection", "false"); + System.setProperty("org.daisy.pipeline.tts.host.protection", "false"); boolean valid = isValid(new AudioFormat(8000, 8, 1, true, true)); Assert.assertTrue(valid); }