Merge pull request #795 from lottev1991/GermanLyricsHelper

[Phonetic Assistant] Add German Lyrics Helper + missing Spanish view model option
stakira · Jul 30, 2023 · dcd167b · dcd167b
2 parents 1fe180e + 2b6f943
commit dcd167b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/OpenUtau.Core/Util/LyricsHelper.cs b/OpenUtau.Core/Util/LyricsHelper.cs
@@ -36,6 +36,7 @@ public Type GetPreferred() {
             typeof(PinyinLyricsHelper),
             typeof(ArpabetG2pLyricsHelper),
             typeof(FrenchG2pLyricsHelper),
+            typeof(GermanG2pLyricsHelper),
             typeof(ItalianG2pLyricsHelper),
             typeof(PortugueseG2pLyricsHelper),
             typeof(RussianG2pLyricsHelper),
@@ -80,6 +81,10 @@ public class FrenchG2pLyricsHelper : G2pLyricsHelper {
         public FrenchG2pLyricsHelper() : base(new FrenchG2p()) { }
     }
 
+    public class GermanG2pLyricsHelper : G2pLyricsHelper {
+        public GermanG2pLyricsHelper() : base(new GermanG2p()) { }
+    }
+
     public class ItalianG2pLyricsHelper : G2pLyricsHelper {
         public ItalianG2pLyricsHelper() : base(new ItalianG2p()) { }
     }
@@ -96,3 +101,4 @@ public class SpanishG2pLyricsHelper : G2pLyricsHelper {
         public SpanishG2pLyricsHelper() : base(new SpanishG2p()) { }
     }
 }
+
diff --git a/OpenUtau/ViewModels/PhoneticAssistantViewModel.cs b/OpenUtau/ViewModels/PhoneticAssistantViewModel.cs
@@ -25,9 +25,11 @@ public G2pOption(Type klass) {
         private readonly List<G2pOption> g2ps = new List<G2pOption>() {
             new G2pOption(typeof(ArpabetG2p)),
             new G2pOption(typeof(FrenchG2p)),
+            new G2pOption(typeof(GermanG2p)),
             new G2pOption(typeof(ItalianG2p)),
             new G2pOption(typeof(PortugueseG2p)),
             new G2pOption(typeof(RussianG2p)),
+            new G2pOption(typeof(SpanishG2p)),
         };
 
         private Api.G2pPack? g2p;