Merge pull request #45 from oxygen-dioxide/insider

Insider

Author: oxygen-dioxide

OpenUtau.Core/Classic/UstNote.cs

@@ -37,7 +37,7 @@ public UstNote(UProject project, UTrack track, UVoicePart part, UNote note) {
                 intensity = (int)phoneme.GetExpression(project, track, Ustx.VOL).Item1;
                 modulation = (int)phoneme.GetExpression(project, track, Ustx.MOD).Item1;
                 flags = FlagsToString(phoneme.GetResamplerFlags(project, track));
-                if (phoneme.oto != null) {
+                if (phoneme.oto != null && phoneme.oto.File != null) {
                     var relativePath = Path.GetRelativePath(track.Singer.Location, phoneme.oto.File);
                     filename = relativePath;
                     alias = phoneme.oto.Alias;

OpenUtau.Core/Commands/TrackCommands.cs

@@ -100,6 +100,19 @@ public RenameTrackCommand(UProject project, UTrack track, string name) {
         public override void Unexecute() => track.TrackName = oldName;
     }
 
+    public class ChangeTrackColorCommand : TrackCommand {
+        readonly string newName, oldName;
+        public ChangeTrackColorCommand(UProject project, UTrack track, string colorName) {
+            this.project = project;
+            this.track = track;
+            newName = colorName;
+            oldName = track.TrackColor;
+        }
+        public override string ToString() => "Change track color";
+        public override void Execute() => track.TrackColor = newName;
+        public override void Unexecute() => track.TrackColor = oldName;
+    }
+
     public class TrackChangeSingerCommand : TrackCommand {
         readonly USinger newSinger, oldSinger;
         public TrackChangeSingerCommand(UProject project, UTrack track, USinger newSinger) {

OpenUtau.Core/Enunu/EnunuEnglishPhonemizer.cs

@@ -12,7 +12,7 @@
 using TinyPinyin;
 
 namespace OpenUtau.Core.Enunu {
-    [Phonemizer("Enunu English Phonemizer", "ENUNU EN", language:"EN")]
+    [Phonemizer("Enunu English Phonemizer", "ENUNU EN", "O3", language:"EN")]
     public class EnunuEnglishPhonemizer : EnunuPhonemizer {
         readonly string PhonemizerType = "ENUNU EN";
 
@@ -104,14 +104,14 @@ protected EnunuNote[] ProcessWord(Note[] notes, int noteIndex) {
             // - Tries to align every note to one syllable.
             // - "+n" manually aligns to n-th phoneme.
             alignments.Clear();
-            int position = 0;
+            //notes except those whose lyrics start witn "+*" or "+~"
+            var nonExtensionNotes = notes.Where(n=>!IsSyllableVowelExtensionNote(n)).ToArray();
             for (int i = 0; i < symbols.Length; i++) {
-                if (isVowel[i] && alignments.Count < notes.Length) {
-                    alignments.Add(Tuple.Create(i, position, false));
-                    position += notes[alignments.Count - 1].duration;
+                if (isVowel[i] && alignments.Count < nonExtensionNotes.Length) {
+                    alignments.Add(Tuple.Create(i, nonExtensionNotes[alignments.Count].position - notes[0].position, false));
                 }
             }
-            position = notes[0].duration;
+            int position = notes[0].duration;
             for (int i = 1; i < notes.Length; ++i) {
                 if (int.TryParse(notes[i].lyric.Substring(1), out var idx)) {
                     alignments.Add(Tuple.Create(idx - 1, position, true));
@@ -164,6 +164,15 @@ protected EnunuNote[] ProcessWord(Note[] notes, int noteIndex) {
             return enunuNotes.ToArray();
         }
 
+        /// <summary>
+        /// Does this note extend the previous syllable?
+        /// </summary>
+        /// <param name="note"></param>
+        /// <returns></returns>
+        protected bool IsSyllableVowelExtensionNote(Note note) {
+            return note.lyric.StartsWith("+~") || note.lyric.StartsWith("+*");
+        }
+
         protected override EnunuNote[] NoteGroupsToEnunu(Note[][] notes) {
             var result = new List<EnunuNote>();
             int position = 0;

OpenUtau.Core/PlaybackManager.cs

@@ -62,7 +62,6 @@ private PlaybackManager() {
         public Audio.IAudioOutput AudioOutput { get; set; } = new Audio.DummyAudioOutput();
         public bool Playing => AudioOutput.PlaybackState == PlaybackState.Playing;
         public bool StartingToPlay { get; private set; }
-        public bool SoloTrackExist { get; set; } = false;
 
         public void PlayTestSound() {
             masterMix = null;

OpenUtau.Core/Ustx/UProject.cs

@@ -49,6 +49,7 @@ public class UProject {
         public List<UTempo> tempos;
         public List<UTrack> tracks;
         [YamlIgnore] public List<UPart> parts;
+        public bool SoloTrackExist { get => tracks.Any(t => t.Solo); }
 
         /// <summary>
         /// Transient field used for serialization.

OpenUtau.Core/Ustx/UTrack.cs

@@ -88,6 +88,7 @@ public USinger Singer {
         [YamlIgnore] public string SingerName => Singer != null ? Singer.DisplayName : "[No Singer]";
         [YamlIgnore] public int TrackNo { set; get; }
         public string TrackName { get; set; } = "New Track";
+        public string TrackColor { get; set; } = "Blue";
         [YamlIgnore] public bool Muted { set; get; }
         public bool Mute { get; set; }
         public bool Solo { get; set; }
@@ -179,9 +180,7 @@ public void AfterLoad(UProject project) {
                 };
             }
             TrackNo = project.tracks.IndexOf(this);
-            if (Solo) {
-                PlaybackManager.Inst.SoloTrackExist = true;
-            } else if (Mute) {
+            if (!Solo && Mute) {
                 Muted = true;
             }
         }

OpenUtau.Core/Util/Preferences.cs

@@ -112,6 +112,7 @@ public class SerializablePreferences {
             public bool ShowPrefs = true;
             public bool ShowTips = true;
             public int Theme;
+            public bool UseTrackColor = false;
             public bool PreRender = true;
             public int NumRenderThreads = 2;
             public string OnnxRunner = string.Empty;

OpenUtau.Plugin.Builtin/JapaneseCVVCPhonemizer.cs

@@ -67,7 +67,7 @@ public class JapaneseCVVCPhonemizer : Phonemizer {
 
         // in case voicebank is missing certain symbols
         static readonly string[] substitution = new string[] {  
-            "ty,ch,ts=t", "j,dy=d", "gy=g", "ky=k", "py=p", "ny=n", "ry=r", "hy,f=h", "by,v=b", "dz=z", "l=r", "ly=l"
+            "ty,ch,ts=t", "j,dy=d", "gy=g", "ky=k", "py=p", "ny=n", "ry=r", "my=m", "hy,f=h", "by,v=b", "dz=z", "l=r", "ly=l"
         };
 
         static readonly Dictionary<string, string> vowelLookup;

OpenUtau.Plugin.Builtin/JapanesePresampPhonemizer.cs

@@ -21,7 +21,7 @@ public class JapanesePresampPhonemizer : Phonemizer {
 
         // in case voicebank is missing certain symbols
         static readonly string[] substitution = new string[] {  
-            "ty,ch,ts=t", "j,dy=d", "gy=g", "ky=k", "py=p", "ny=n", "ry=r", "hy,f=h", "by,v=b", "dz=z", "l=r", "ly=l"
+            "ty,ch,ts=t", "j,dy=d", "gy=g", "ky=k", "py=p", "ny=n", "ry=r", "my=m", "hy,f=h", "by,v=b", "dz=z", "l=r", "ly=l"
         };
 
         static readonly Dictionary<string, string> substituteLookup;

OpenUtau.Plugin.Builtin/LatinDiphonePhonemizer.cs

@@ -16,6 +16,7 @@ public abstract class LatinDiphonePhonemizer : Phonemizer {
         protected IG2p g2p;
         protected bool isDictionaryLoading;
 
+        //[(index of phoneme, tick position from the lyrical note in notes[], is manual)]
         protected readonly List<Tuple<int, int, bool>> alignments = new List<Tuple<int, int, bool>>();
 
         /// <summary>
@@ -89,14 +90,14 @@ public override Result Process(Note[] notes, Note? prev, Note? next, Note? prevN
             // - Tries to align every note to one syllable.
             // - "+n" manually aligns to n-th phoneme.
             alignments.Clear();
-            int position = 0;
+            //notes except those whose lyrics start witn "+*" or "+~"
+            var nonExtensionNotes = notes.Where(n=>!IsSyllableVowelExtensionNote(n)).ToArray();
             for (int i = 0; i < symbols.Length; i++) {
-                if (isVowel[i] && alignments.Count < notes.Length) {
-                    alignments.Add(Tuple.Create(i, position, false));
-                    position += notes[alignments.Count - 1].duration;
+                if (isVowel[i] && alignments.Count < nonExtensionNotes.Length) {
+                    alignments.Add(Tuple.Create(i, nonExtensionNotes[alignments.Count].position - notes[0].position, false));
                 }
             }
-            position = notes[0].duration;
+            int position = notes[0].duration;
             for (int i = 1; i < notes.Length; ++i) {
                 if (int.TryParse(notes[i].lyric.Substring(1), out var idx)) {
                     alignments.Add(Tuple.Create(idx - 1, position, true));
@@ -154,6 +155,15 @@ public override Result Process(Note[] notes, Note? prev, Note? next, Note? prevN
             };
         }
 
+        /// <summary>
+        /// Does this note extend the previous syllable?
+        /// </summary>
+        /// <param name="note"></param>
+        /// <returns></returns>
+        protected bool IsSyllableVowelExtensionNote(Note note) {
+            return note.lyric.StartsWith("+~") || note.lyric.StartsWith("+*");
+        }
+
         string[] GetSymbols(Note note) {
             if (string.IsNullOrEmpty(note.phoneticHint)) {
                 // User has not provided hint, query CMUdict.