Merge pull request #981 from oxygen-dioxide/worldline-external-wavtool

Support using worldline resampler together with external wavtool
stakira · Dec 13, 2023 · 5445ace · 5445ace
2 parents f23b171 + 95c3d61
commit 5445ace
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/OpenUtau.Core/Classic/ExeWavtool.cs b/OpenUtau.Core/Classic/ExeWavtool.cs
@@ -26,6 +26,15 @@ public float[] Concatenate(List<ResamplerItem> 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
@@ -105,13 +105,7 @@ public static IReadOnlyList<IResampler> GetSupportedResamplers(IWavtool? wavtool
         }
 
         public static IReadOnlyList<IWavtool> 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;
         }
     }
 }