less than three

Author: RhythmicSys

TTSJava/src/main/java/simplexity/clitts/TTSConfig.java

@@ -44,8 +44,9 @@ public static void reloadConfig() {
             System.out.println("Please update your config file to use the correct region.");
         }
         String voice = config.getString("default-voice");
+        System.out.println(voice);
         try {
-            VoiceId.valueOf(voice);
+            defaultVoice = VoiceId.valueOf(voice);
         } catch (IllegalArgumentException e) {
             System.out.println("Error: " + voice + " is not a valid voice. " +
                     "Please make sure you are only choosing from standard voices"

TTSJava/src/main/java/simplexity/clitts/TextToSpeech.java

@@ -3,12 +3,9 @@
 import com.amazonaws.ClientConfiguration;
 import com.amazonaws.auth.DefaultAWSCredentialsProviderChain;
 import com.amazonaws.regions.Region;
-import com.amazonaws.regions.Regions;
 import com.amazonaws.services.polly.AmazonPolly;
 import com.amazonaws.services.polly.AmazonPollyClient;
-import com.amazonaws.services.polly.model.OutputFormat;
-import com.amazonaws.services.polly.model.SynthesizeSpeechRequest;
-import com.amazonaws.services.polly.model.SynthesizeSpeechResult;
+import com.amazonaws.services.polly.model.*;
 import javazoom.jl.decoder.JavaLayerException;
 import javazoom.jl.player.advanced.AdvancedPlayer;
 import javazoom.jl.player.advanced.PlaybackEvent;
@@ -19,8 +16,7 @@
 
 public class TextToSpeech {
 
-    private static final Region AWS_REGION = Region.getRegion(Regions.US_EAST_1);
-    private static final String VOICE_ID = "Joanna"; // Change the voice ID as needed
+    private static Region AWS_REGION;
     private static final Scanner scanner = new Scanner(System.in);
     private static AmazonPollyClient polly;
     private static boolean runProgram = true;
@@ -30,54 +26,74 @@ public TextToSpeech() {
         polly.setRegion(AWS_REGION);
     }
 
-    public InputStream synthesizeSpeech(AmazonPolly polly, String text) {
-        SynthesizeSpeechRequest synthesizeSpeechRequest = new SynthesizeSpeechRequest().withText(text).withVoiceId(VOICE_ID).withOutputFormat(OutputFormat.Mp3);
+    public InputStream synthesizeSpeech(AmazonPolly polly, String text, VoiceId voice) {
+        SynthesizeSpeechRequest synthesizeSpeechRequest = new SynthesizeSpeechRequest()
+                .withText(text)
+                .withVoiceId(voice)
+                .withOutputFormat(OutputFormat.Mp3);
         SynthesizeSpeechResult synthesizeSpeechResult = polly.synthesizeSpeech(synthesizeSpeechRequest);
         return synthesizeSpeechResult.getAudioStream();
     }
 
-    public InputStream synthesizeSSMLSpeech(AmazonPolly polly, String text) {
-        SynthesizeSpeechRequest synthesizeSpeechRequest = new SynthesizeSpeechRequest().withText(text).withTextType("ssml").withVoiceId(VOICE_ID).withOutputFormat(OutputFormat.Mp3);
-        SynthesizeSpeechResult synthesizeSpeechResult = polly.synthesizeSpeech(synthesizeSpeechRequest);
-        return synthesizeSpeechResult.getAudioStream();
+    public InputStream synthesizeSSMLSpeech(AmazonPolly polly, String text, VoiceId voice) {
+        String ssml = "<speak>" + text + "</speak>";
+        SynthesizeSpeechRequest synthesizeSpeechRequest;
+        try {
+            synthesizeSpeechRequest = new SynthesizeSpeechRequest()
+                    .withText(ssml)
+                    .withTextType(TextType.Ssml)
+                    .withVoiceId(voice)
+                    .withOutputFormat(OutputFormat.Mp3);
+            SynthesizeSpeechResult synthesizeSpeechResult = polly.synthesizeSpeech(synthesizeSpeechRequest);
+            return synthesizeSpeechResult.getAudioStream();
+        } catch (RuntimeException e) {
+            System.out.println("Error: " + e.getMessage());
+            return null;
+        }
     }
 
     public String replaceText(String text) {
         for (String key : TTSConfig.getReplaceText().keySet()) {
             text = text.replace(key, TTSConfig.getReplaceText().get(key));
+            System.out.println("key: " + key);
+            System.out.println("value: " + TTSConfig.getReplaceText().get(key));
         }
         return text;
     }
 
 
     public static void main(String[] args) {
         System.out.println("Type your text, press Enter to convert to speech. Type 'exit' to end the program.");
+        TTSConfig.reloadConfig();
+        VoiceId VOICE_ID = TTSConfig.defaultVoice;
+        AWS_REGION = TTSConfig.AWS_REGION;
         TextToSpeech tts = new TextToSpeech();
         InputStream speechStream;
-        TTSConfig.reloadConfig();
+        System.out.println("Using voice: " + VOICE_ID);
         while (runProgram) {
             System.out.println("Enter text:");
             String text = scanner.nextLine();
-            String textRef = text;
             switch (text) {
                 case ("--exit") -> {
                     runProgram = false;
                     System.out.println("Program ended.");
                 }
                 case ("--help") ->
                         System.out.println("Type your text, press Enter to convert to speech. Type '--exit' to end the program.");
-                case ("--reload") -> {
-                    TTSConfig.reloadConfig();
-                    System.out.println("Config reloaded.");
-                }
                 default -> {
-                    text = tts.replaceText(text);
-                    boolean useSSML = !textRef.equals(text);
+                    System.out.println(text);
+                    String newText = tts.replaceText(text);
+                    System.out.println(newText);
+                    boolean useSSML = !text.equals(newText);
                     try {
                         if (!useSSML) {
-                            speechStream = tts.synthesizeSpeech(polly, text);
+                            speechStream = tts.synthesizeSpeech(polly, newText, VOICE_ID);
                         } else {
-                            speechStream = tts.synthesizeSSMLSpeech(polly, text);
+                            speechStream = tts.synthesizeSSMLSpeech(polly, newText, VOICE_ID);
+                        }
+                        if (speechStream == null) {
+                            System.out.println("Error: Speech stream is null.");
+                            continue;
                         }
                         AdvancedPlayer player = new AdvancedPlayer(speechStream, javazoom.jl.player.FactoryRegistry.systemRegistry().createAudioDevice());
                         player.setPlayBackListener(new PlaybackListener() {

TTSJava/src/main/resources/application.conf

@@ -1,6 +1,13 @@
 aws-region = "US_EAST_1"
 default-voice = "Kimberly"
 replace-text {
+  "**" = "<prosody volume=\"x-loud\" pitch=\"low\" rate=\"slow\">"
+  "/*" = "</prosody>"
+  "*/" = "</prosody>"
+  "~~" = "<amazon:effect name=\"whispered\">"
+  "/~" = "</amazon:effect>"
+  "~/" = "</amazon:effect>"
+  "__" = "<emphasis level=\"strong\">"
   "/_" = "</emphasis>"
   "_/" = "</emphasis>"
   "++" = "<prosody volume=\"x-loud\" rate=\"fast\">"