added methods to improve SynthesisConfig class and to retrieve Synthesis configs in MaryConfig. NOTE: MaryConfig.checkConsistency() is never used.

Author: Tristan Hamilton

marytts-runtime/src/main/java/marytts/config/MaryConfig.java

@@ -71,6 +71,15 @@ public static void checkConsistency() throws MaryConfigurationException {
 						+ "', but there is no corresponding language config.");
 			}
 		}
+		// Check that for each synthesis config, we have a matching synthesis class
+		if (getSynthesisConfigs() == null){
+			throw new MaryConfigurationException("No synthesizer config");
+		}
+		for (SynthesisConfig sc : getSynthesisConfigs()) {
+			if (MaryProperties.synthesizerClasses().contains(sc.getSynthesisName())) {
+				throw new MaryConfigurationException("Synthesizer '" + sc.getSynthesisName() + "' is not in config properties.");
+			}
+		}
 	}
 
 	public static int countConfigs() {
@@ -145,6 +154,17 @@ public static LanguageConfig getLanguageConfig(Locale locale) {
 		return null;
 	}
 
+	public static Iterable<SynthesisConfig> getSynthesisConfigs() {
+		Set<SynthesisConfig> scs = new HashSet<SynthesisConfig>();
+		for (MaryConfig mc : configLoader) {
+			if (mc.isSynthesisConfig()) {
+				SynthesisConfig sc = (SynthesisConfig) mc;
+				scs.add(sc);
+			}
+		}
+		return scs;
+	}
+
 	/**
 	 * Get the voice config for the given voice name, or null if there is no such voice config.
 	 * 

marytts-runtime/src/main/java/marytts/config/SynthesisConfig.java

@@ -33,10 +33,22 @@ public class SynthesisConfig extends MaryConfig {
 
 	public SynthesisConfig(InputStream propertyStream) throws MaryConfigurationException {
 		super(propertyStream);
+		if (getSynthesisName() == null) {
+			throw new MaryConfigurationException("No synthesizer class defined in config file");
+		}
 	}
 
 	@Override
 	public boolean isSynthesisConfig() {
 		return true;
 	}
+	
+	/**
+	 * The synthesizer's name.
+	 * 
+	 * @return
+	 */
+	public String getSynthesisName() {
+		return getProperties().getProperty("synthesizers.classes.list");
+	}
 }