diff --git a/OpenUtau.Core/DiffSinger/DiffSingerRenderer.cs b/OpenUtau.Core/DiffSinger/DiffSingerRenderer.cs index 0c1bf2706..bf5cebba2 100644 --- a/OpenUtau.Core/DiffSinger/DiffSingerRenderer.cs +++ b/OpenUtau.Core/DiffSinger/DiffSingerRenderer.cs @@ -533,24 +533,20 @@ public RenderPitchResult LoadRenderedPitch(RenderPhrase phrase, double? pitchSte } public RenderPitchResult LoadRenderedPitch(RenderPhrase phrase, HashSet selectedNotePositions) { - return LoadRenderedPitch(phrase, selectedNotePositions, pitchSteps: null, fastRealtime: false, forceLocalRetake: false); + return LoadRenderedPitch(phrase, selectedNotePositions, pitchSteps: null, fastRealtime: false); } /// Live pitch: partial retake for changed notes with fast sampling settings. internal RenderPitchResult LoadRenderedPitchLive( RenderPhrase phrase, HashSet selectedNotePositions, double pitchSteps, bool fastRealtime) { - return LoadRenderedPitch(phrase, selectedNotePositions, pitchSteps, fastRealtime, forceLocalRetake: true); + return LoadRenderedPitch(phrase, selectedNotePositions, pitchSteps, fastRealtime); } RenderPitchResult LoadRenderedPitch( RenderPhrase phrase, HashSet selectedNotePositions, double? pitchSteps, - bool fastRealtime, - bool forceLocalRetake) { - if (!forceLocalRetake && !Preferences.Default.DiffSingerLocalRetaking) { - return LoadRenderedPitch(phrase, pitchSteps, fastRealtime); - } + bool fastRealtime) { DiffSingerSinger singer = (DiffSingerSinger) phrase.singer; if (!singer.HasPitchPredictor) { throw new Exception("This singer has no pitch predictor."); diff --git a/OpenUtau.Core/Util/Preferences.cs b/OpenUtau.Core/Util/Preferences.cs index e7d94c521..9d881b240 100644 --- a/OpenUtau.Core/Util/Preferences.cs +++ b/OpenUtau.Core/Util/Preferences.cs @@ -193,7 +193,6 @@ public class SerializablePreferences { public bool DiffSingerTensorCache = true; public bool DiffSingerVarianceLocalPitchPatch = false; public bool DiffSingerLangCodeHide = false; - public bool DiffSingerLocalRetaking = false; public bool Metronome = false; public bool SkipRenderingMutedTracks = false; public string Language = string.Empty; diff --git a/OpenUtau/Strings/Strings.axaml b/OpenUtau/Strings/Strings.axaml index 430dbc7ae..fda2728f6 100644 --- a/OpenUtau/Strings/Strings.axaml +++ b/OpenUtau/Strings/Strings.axaml @@ -709,7 +709,6 @@ Warning: this option removes custom presets. Rendering Default renderer (for classic voicebanks) DiffSinger Render Depth - DiffSinger Pitch Local Retaking DiffSinger Render Steps for Acoustic DiffSinger Render Steps for Pitch DiffSinger Render Steps for Variance diff --git a/OpenUtau/ViewModels/PreferencesViewModel.cs b/OpenUtau/ViewModels/PreferencesViewModel.cs index c77a4218f..ee0eba081 100644 --- a/OpenUtau/ViewModels/PreferencesViewModel.cs +++ b/OpenUtau/ViewModels/PreferencesViewModel.cs @@ -138,7 +138,6 @@ public int SafeMaxThreadCount { [Reactive] public partial bool DiffSingerTensorCache { get; set; } [Reactive] public partial bool DiffSingerVarianceLocalPitchPatch { get; set; } [Reactive] public partial bool DiffSingerLangCodeHide { get; set; } - [Reactive] public partial bool DiffSingerLocalRetaking { get; set; } // Advanced [Reactive] public partial bool RememberMid { get; set; } @@ -222,7 +221,6 @@ public PreferencesViewModel() { DiffSingerTensorCache = Preferences.Default.DiffSingerTensorCache; DiffSingerVarianceLocalPitchPatch = Preferences.Default.DiffSingerVarianceLocalPitchPatch; DiffSingerLangCodeHide = Preferences.Default.DiffSingerLangCodeHide; - DiffSingerLocalRetaking = Preferences.Default.DiffSingerLocalRetaking; SkipRenderingMutedTracks = Preferences.Default.SkipRenderingMutedTracks; ThemeName = Preferences.Default.ThemeName; DegreeStyle = Preferences.Default.DegreeStyle; @@ -447,8 +445,6 @@ public PreferencesViewModel() { value => Preferences.Default.DiffSingerVarianceLocalPitchPatch = value); PersistOn(this.WhenAnyValue(vm => vm.DiffSingerLangCodeHide), value => Preferences.Default.DiffSingerLangCodeHide = value); - PersistOn(this.WhenAnyValue(vm => vm.DiffSingerLocalRetaking), - value => Preferences.Default.DiffSingerLocalRetaking = value); PersistOn(this.WhenAnyValue(vm => vm.SkipRenderingMutedTracks), skipRenderingMutedTracks => Preferences.Default.SkipRenderingMutedTracks = skipRenderingMutedTracks); } diff --git a/OpenUtau/Views/PreferencesDialog.axaml b/OpenUtau/Views/PreferencesDialog.axaml index 13eabfc1a..3a973e481 100644 --- a/OpenUtau/Views/PreferencesDialog.axaml +++ b/OpenUtau/Views/PreferencesDialog.axaml @@ -391,10 +391,6 @@ - - - -