Merge PR #1535: Apply 'Load all depth folders' to resamplers, wavtools, dll phonemizers and UTAU plugins#71
Merged
Merged
Conversation
…rs and UTAU plugins too.
… wavtools, dll phonemizers and UTAU plugins Cherry-picked from openutau#1535. Conflict in DocManager.SearchAllPlugins: our main already replaced the flat recursive EnumerateFiles with SearchPluginInternal (from openutau#2270), which recurses but stops descending into directories containing plugin.txt so it doesn't pick up DLLs belonging to legacy UTAU plugins. That is strictly better than this PR's version, so kept it, and instead honoured the PR's intent by making SearchPluginInternal stop recursing when LoadDeepFolderSinger is off. LoadDeepFolderSinger defaults to true, so default behaviour is unchanged; only users who deliberately turned the toggle off get the shallower scan.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Cherry-picked from openutau/OpenUtau#1535. Makes the existing Load all depth folders preference apply to resamplers, wavtools, DLL phonemizers and UTAU plugins, not just singers.
LoadDeepFolderSingerdefaults totrue, so default behaviour is unchanged — only users who deliberately turned the toggle off get the shallower scan, which is exactly what they asked for.Conflict resolution
DocManager.SearchAllPluginsconflicted. Our main had already replaced the flat recursiveEnumerateFileswithSearchPluginInternal(from openutau#2270), which recurses but stops descending into directories containingplugin.txt, so it does not scoop up DLLs belonging to legacy UTAU plugins.That is strictly better than this PR's version, so I kept it and honoured the PR's intent differently:
SearchPluginInternalnow stops recursing when the preference is off.