diff --git a/OpenUtau.Core/Classic/ExeWavtool.cs b/OpenUtau.Core/Classic/ExeWavtool.cs index f852e3138..1c5c597e7 100644 --- a/OpenUtau.Core/Classic/ExeWavtool.cs +++ b/OpenUtau.Core/Classic/ExeWavtool.cs @@ -26,6 +26,15 @@ public float[] Concatenate(List resamplerItems, string tempPath, if (cancellation.IsCancellationRequested) { return null; } + //The builtin worldline resampler can't be called from bat script, + //so we need to call it directly from C# + foreach(var item in resamplerItems){ + if(!(item.resampler is ExeResampler) && !cancellation.IsCancellationRequested && !File.Exists(item.outputFile)){ + lock (Renderers.GetCacheLock(item.outputFile)) { + item.resampler.DoResamplerReturnsFile(item, Log.Logger); + } + } + } PrepareHelper(); string batPath = Path.Combine(PathManager.Inst.CachePath, "temp.bat"); lock (tempBatLock) { diff --git a/OpenUtau.Core/Render/Renderers.cs b/OpenUtau.Core/Render/Renderers.cs index bc55a2ef9..704f15454 100644 --- a/OpenUtau.Core/Render/Renderers.cs +++ b/OpenUtau.Core/Render/Renderers.cs @@ -105,13 +105,7 @@ public static IReadOnlyList GetSupportedResamplers(IWavtool? wavtool } public static IReadOnlyList GetSupportedWavtools(IResampler? resampler) { - if (resampler is WorldlineResampler) { - return ToolsManager.Inst.Wavtools - .Where(r => r is SharpWavtool) - .ToArray(); - } else { - return ToolsManager.Inst.Wavtools; - } + return ToolsManager.Inst.Wavtools; } } }