Update to VoiceBuilding plugin 5.5-SNAPSHOT

marytts · Aug 26, 2020 · 8b332a8 · 8b332a8
1 parent 59ad441
commit 8b332a8
Showing 1 changed file with 46 additions and 46 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,56 +1,56 @@
 plugins {
-    id 'de.dfki.mary.voicebuilding-base' version '5.2.2'
+    id 'de.dfki.mary.voicebuilding-base' version '5.5-SNAPSHOT'
 }
 
 group 'de.dfki.mary'
 version '5.3-SNAPSHOT'
 
-voice {
-    name = 'bits1-hsmm'
-    language = 'de'
-    gender = 'female'
-    type = 'hsmm'
-    description = 'A female German hidden semi-Markov model voice, built from voice recordings provided by the BITS project at the Bavarian Archive of Speech Signals'
-    license {
-        name = 'Creative Commons Attribution-NoDerivs 3.0 Unported'
-        shortName = 'CC-BY-ND'
-        url = 'http://mary.dfki.de/download/by-nd-3.0.html'
+marytts {
+    voice {
+        name = 'bits1-hsmm'
+        language = 'de'
+        gender = 'female'
+        type = 'hsmm'
+        description = 'A female German hidden semi-Markov model voice, built from voice recordings provided by the BITS project at the Bavarian Archive of Speech Signals'
+        license {
+            name = 'Creative Commons Attribution-NoDerivs 3.0 Unported'
+            shortName = 'CC-BY-ND'
+            url = 'http://mary.dfki.de/download/by-nd-3.0.html'
+        }
+        samplingRate = 16000
     }
-    samplingRate = 16000
 }
 
-afterEvaluate {
-    generateVoiceConfig {
-        config << [
-                alpha               : 0.42,
-                gamma               : 0,
-                logGain             : false,
-                beta                : 0.3,
-                Ftd                 : 'jar:/marytts/voice/Bits1Hsmm/tree-dur.inf',
-                Ftf                 : 'jar:/marytts/voice/Bits1Hsmm/tree-lf0.inf',
-                Ftm                 : 'jar:/marytts/voice/Bits1Hsmm/tree-mgc.inf',
-                Fts                 : 'jar:/marytts/voice/Bits1Hsmm/tree-str.inf',
-                Fmd                 : 'jar:/marytts/voice/Bits1Hsmm/dur.pdf',
-                Fmf                 : 'jar:/marytts/voice/Bits1Hsmm/lf0.pdf',
-                Fmm                 : 'jar:/marytts/voice/Bits1Hsmm/mgc.pdf',
-                Fms                 : 'jar:/marytts/voice/Bits1Hsmm/str.pdf',
-                useGV               : true,
-                maxMgcGvIter        : 30,
-                maxLf0GvIter        : 0,
-                Fgvf                : 'jar:/marytts/voice/Bits1Hsmm/gv-lf0-littend.pdf',
-                Fgvm                : 'jar:/marytts/voice/Bits1Hsmm/gv-mgc-littend.pdf',
-                Fgvs                : 'jar:/marytts/voice/Bits1Hsmm/gv-str-littend.pdf',
-                FeaFile             : 'jar:/marytts/voice/Bits1Hsmm/US10010923_0.pfeats',
-                trickyPhonesFile    : 'jar:/marytts/voice/Bits1Hsmm/trickyPhones.txt',
-                useMixExc           : true,
-                Fif                 : 'jar:/marytts/voice/Bits1Hsmm/mix_excitation_filters.txt',
-                in                  : 5,
-                useAcousticModels   : true,
-                acousticModels      : 'duration F0',
-                'duration.model'    : 'hmm',
-                'duration.attribute': 'd',
-                'F0.model'          : 'hmm',
-                'F0.attribute'      : 'f0'
-        ]
-    }
+generateVoiceConfig {
+    config.putAll([
+            alpha               : 0.42,
+            gamma               : 0,
+            logGain             : false,
+            beta                : 0.3,
+            Ftd                 : 'jar:/marytts/voice/Bits1Hsmm/tree-dur.inf',
+            Ftf                 : 'jar:/marytts/voice/Bits1Hsmm/tree-lf0.inf',
+            Ftm                 : 'jar:/marytts/voice/Bits1Hsmm/tree-mgc.inf',
+            Fts                 : 'jar:/marytts/voice/Bits1Hsmm/tree-str.inf',
+            Fmd                 : 'jar:/marytts/voice/Bits1Hsmm/dur.pdf',
+            Fmf                 : 'jar:/marytts/voice/Bits1Hsmm/lf0.pdf',
+            Fmm                 : 'jar:/marytts/voice/Bits1Hsmm/mgc.pdf',
+            Fms                 : 'jar:/marytts/voice/Bits1Hsmm/str.pdf',
+            useGV               : true,
+            maxMgcGvIter        : 30,
+            maxLf0GvIter        : 0,
+            Fgvf                : 'jar:/marytts/voice/Bits1Hsmm/gv-lf0-littend.pdf',
+            Fgvm                : 'jar:/marytts/voice/Bits1Hsmm/gv-mgc-littend.pdf',
+            Fgvs                : 'jar:/marytts/voice/Bits1Hsmm/gv-str-littend.pdf',
+            FeaFile             : 'jar:/marytts/voice/Bits1Hsmm/US10010923_0.pfeats',
+            trickyPhonesFile    : 'jar:/marytts/voice/Bits1Hsmm/trickyPhones.txt',
+            useMixExc           : true,
+            Fif                 : 'jar:/marytts/voice/Bits1Hsmm/mix_excitation_filters.txt',
+            in                  : 5,
+            useAcousticModels   : true,
+            acousticModels      : 'duration F0',
+            'duration.model'    : 'hmm',
+            'duration.attribute': 'd',
+            'F0.model'          : 'hmm',
+            'F0.attribute'      : 'f0'
+        ])
 }