Merge branch 'stakira:master' into master

Author: oxygen-dioxide

LICENSE.txt

@@ -19,5 +19,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
-
-This license covers both OpenUtau source code and Worldline prebuilt binaries.

OpenUtau.Core/Api/Phonemizer.cs

@@ -97,10 +97,21 @@ public struct PhonemeAttributes {
             public string voiceColor;
         }
 
+        public struct PhonemeExpression {
+            public string abbr;
+            public float value;
+        }
+
         /// <summary>
         /// The output struct that represents a phoneme.
         /// </summary>
         public struct Phoneme {
+            /// <summary>
+            /// Number to manage phonemes in note.
+            /// Optional. Whether to specify an index or not should be consistent within Phonemizer (All phonemes should be indexed, or all should be unindexed).
+            /// </summary>
+            public int? index;
+
             /// <summary>
             /// Phoneme name. Should match one of oto alias.
             /// Note that you don't have to return tone-mapped phonemes. OpenUtau will do it afterwards.
@@ -111,16 +122,14 @@ public struct Phoneme {
 
             /// <summary>
             /// Position of phoneme in note. Measured in ticks.
-            /// Use TickToMs() and MsToTick() to convert between ticks and milliseconds .
+            /// Use TickToMs() and MsToTick() to convert between ticks and milliseconds.
             /// </summary>
             public int position;
 
             /// <summary>
-            /// Suggested attributes. May or may not be used eventually.
+            /// Suggested attributes. It may later be overwritten with a user-specified value.
             /// </summary>
-            public PhonemeAttributes attributes;
-
-            public int? index;
+            public List<PhonemeExpression> expressions;
 
             public override string ToString() => $"\"{phoneme}\" pos:{position}";
         }
@@ -161,7 +170,7 @@ public struct Result {
         /// </summary>
         public virtual bool LegacyMapping => false;
 
-        public virtual void SetUp(Note[][] notes) { }
+        public virtual void SetUp(Note[][] notes, UProject project, UTrack track) { }
 
         /// <summary>
         /// Phonemize a consecutive sequence of notes. This is the main logic of a phonemizer.

OpenUtau.Core/Api/PhonemizerRunner.cs

@@ -99,7 +99,7 @@ static PhonemizerResponse Phonemize(PhonemizerRequest request) {
             phonemizer.SetSinger(request.singer);
             phonemizer.SetTiming(request.timeAxis);
             try {
-                phonemizer.SetUp(notes);
+                phonemizer.SetUp(notes, DocManager.Inst.Project, DocManager.Inst.Project.tracks[request.part.trackNo]);
             } catch (Exception e) {
                 Log.Error(e, $"phonemizer failed to setup.");
             }

OpenUtau.Core/BaseChinesePhonemizer.cs

@@ -1,8 +1,8 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
-using OpenUtau.Core.G2p;
 using OpenUtau.Api;
+using OpenUtau.Core.G2p;
+using OpenUtau.Core.Ustx;
 
 namespace OpenUtau.Core {
     public abstract class BaseChinesePhonemizer : Phonemizer {
@@ -43,7 +43,7 @@ public static void RomanizeNotes(Note[][] groups) {
             Enumerable.Zip(groups, ResultLyrics, ChangeLyric).Last();
         }
 
-        public override void SetUp(Note[][] groups) {
+        public override void SetUp(Note[][] groups, UProject project, UTrack track) {
             RomanizeNotes(groups);
         }
     }

OpenUtau.Core/Classic/ClassicRenderer.cs

@@ -25,6 +25,7 @@ public class ClassicRenderer : IRenderer {
             Ustx.ATK,
             Ustx.DEC,
             Ustx.MOD,
+            Ustx.MODP,
             Ustx.ALT,
         };
 

OpenUtau.Core/Classic/ClassicSingerLoader.cs

@@ -11,6 +11,8 @@ static USinger AdjustSingerType(Voicebank v) {
                     return new Core.Enunu.EnunuSinger(v) as USinger;
                 case USingerType.DiffSinger:
                     return new Core.DiffSinger.DiffSingerSinger(v) as USinger;
+                case USingerType.Voicevox:
+                    return new Core.Voicevox.VoicevoxSinger(v) as USinger;
                 default:
                     return new ClassicSinger(v) as USinger;
             }

OpenUtau.Core/Classic/Frq.cs

@@ -2,6 +2,7 @@
 using System.IO;
 using System.Linq;
 using System.Text;
+using OpenUtau.Core;
 
 namespace OpenUtau.Classic {
     public class Frq {
@@ -12,22 +13,40 @@ public class Frq {
         public double[] f0 = new double[0];
         public double[] amp = new double[0];
 
-        public void Load(Stream stream) {
-            using (var reader = new BinaryReader(stream)) {
-                string header = new string(reader.ReadChars(8));
-                if (header != "FREQ0003") {
-                    throw new FormatException("FREQ0003 header not found.");
-                }
-                hopSize = reader.ReadInt32();
-                averageF0 = reader.ReadDouble();
-                _ = reader.ReadBytes(16); // blank
-                int length = reader.ReadInt32();
-                f0 = new double[length];
-                amp = new double[length];
-                for (int i = 0; i < length; i++) {
-                    f0[i] = reader.ReadDouble();
-                    amp[i] = reader.ReadDouble();
+        /// <summary>
+        /// If the wav path is null (machine learning voicebank), return false.
+        /// <summary>
+        public bool Load(string wavPath) {
+            if (string.IsNullOrEmpty(wavPath)) {
+                return false;
+            }
+            string frqFile = VoicebankFiles.GetFrqFile(wavPath);
+            if (!File.Exists(frqFile)) {
+                return false;
+            }
+            try {
+                using (var fileStream = File.OpenRead(frqFile)) {
+                    using (var reader = new BinaryReader(fileStream)) {
+                        string header = new string(reader.ReadChars(8));
+                        if (header != "FREQ0003") {
+                            throw new FormatException("FREQ0003 header not found.");
+                        }
+                        hopSize = reader.ReadInt32();
+                        averageF0 = reader.ReadDouble();
+                        _ = reader.ReadBytes(16); // blank
+                        int length = reader.ReadInt32();
+                        f0 = new double[length];
+                        amp = new double[length];
+                        for (int i = 0; i < length; i++) {
+                            f0[i] = reader.ReadDouble();
+                            amp[i] = reader.ReadDouble();
+                        }
+                    }
                 }
+                return true;
+            } catch (Exception e) {
+                DocManager.Inst.ExecuteCmd(new ErrorMessageNotification("failed to load frq file", e));
+                return false;
             }
         }
 

OpenUtau.Core/Classic/Plugin.cs

@@ -18,7 +18,7 @@ public void Run(string tempFile) {
             }
             var startInfo = new ProcessStartInfo() {
                 FileName = Executable,
-                Arguments = tempFile,
+                Arguments = $"\"{tempFile}\"",
                 WorkingDirectory = Path.GetDirectoryName(Executable),
                 UseShellExecute = UseShell,
             };

OpenUtau.Core/Classic/WorldlineRenderer.cs

@@ -25,6 +25,7 @@ public class WorldlineRenderer : IRenderer {
             Ustx.VEL,
             Ustx.VOL,
             Ustx.MOD,
+            Ustx.MODP,
             Ustx.ALT,
             Ustx.GENC,
             Ustx.BREC,

OpenUtau.Core/Commands/NoteCommands.cs

@@ -95,26 +95,44 @@ public override void Unexecute() {
     }
 
     public class ResizeNoteCommand : NoteCommand {
+        readonly int NewPartDuration;
+        readonly int OldPartDuration;
         readonly int DeltaDur;
         public ResizeNoteCommand(UVoicePart part, UNote note, int deltaDur) : base(part, note) {
             DeltaDur = deltaDur;
+            OldPartDuration = part.Duration;
+            DocManager.Inst.Project.timeAxis.TickPosToBarBeat(note.End + deltaDur, out int bar, out int beat, out int remainingTicks);
+            int minDurTick = DocManager.Inst.Project.timeAxis.BarBeatToTickPos(bar + 2, 0) - part.position;
+            if (part.Duration < minDurTick) {
+                NewPartDuration = minDurTick;
+            }
         }
         public ResizeNoteCommand(UVoicePart part, List<UNote> notes, int deltaDur) : base(part, notes) {
             DeltaDur = deltaDur;
+            OldPartDuration = part.Duration;
+            DocManager.Inst.Project.timeAxis.TickPosToBarBeat((Notes.LastOrDefault()?.End ?? 1) + deltaDur, out int bar, out int beat, out int remainingTicks);
+            int minDurTick = DocManager.Inst.Project.timeAxis.BarBeatToTickPos(bar + 2, 0) - part.position;
+            if (part.Duration < minDurTick) {
+                NewPartDuration = minDurTick;
+            }
         }
         public override string ToString() { return $"Change {Notes.Count()} notes duration"; }
         public override void Execute() {
             lock (Part) {
                 foreach (var note in Notes) {
                     note.duration += DeltaDur;
                 }
+                if (NewPartDuration > 0) {
+                    Part.Duration = NewPartDuration;
+                }
             }
         }
         public override void Unexecute() {
             lock (Part) {
                 foreach (var note in Notes) {
                     note.duration -= DeltaDur;
                 }
+                Part.Duration = OldPartDuration;
             }
         }
     }
@@ -502,11 +520,11 @@ public ChangePhonemeAliasCommand(UVoicePart part, UNote note, int index, string?
 
         public override void Execute() {
             var o = note.GetPhonemeOverride(index);
-            o.phoneme = string.IsNullOrWhiteSpace(newAlias) ? string.Empty : newAlias;
+            o.phoneme = string.IsNullOrWhiteSpace(newAlias) ? null : newAlias;
         }
         public override void Unexecute() {
             var o = note.GetPhonemeOverride(index);
-            o.phoneme = string.IsNullOrWhiteSpace(oldAlias) ? string.Empty : oldAlias;
+            o.phoneme = string.IsNullOrWhiteSpace(oldAlias) ? null : oldAlias;
         }
         public override string ToString() => "Change phoneme alias";
     }