Skip to content

Commit 1d4cf31

Browse files
committed
Revert "Merge pull request #1122 from EX3exp/update-ko-cvvc-phonemizer"
This reverts commit 1d5478a, reversing changes made to 9f91b54.
1 parent 6b71882 commit 1d4cf31

File tree

2 files changed

+506
-440
lines changed

2 files changed

+506
-440
lines changed

OpenUtau.Plugin.Builtin/BaseKoreanPhonemizer.cs

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,6 @@ public abstract class BaseKoreanPhonemizer : Phonemizer {
2323
protected static readonly string[] PLAIN_VOWELS = new string[]{"ㅏ", "ㅣ", "ㅜ", "ㅔ", "ㅗ", "ㅡ", "ㅓ", "ㅢ"};
2424
protected static readonly string[] SOFT_BATCHIMS = new string[]{"ㄴ", "ㄹ", "ㅇ"};
2525
protected static readonly string[] HARD_BATCHIMS = new string[]{"ㄱ", "ㄷ", "ㅂ", "ㅁ"};
26-
27-
// this phonemizer will call ConvertPhonemes() when lyric is hanguel or additionalTest is true . (override to use)
28-
protected virtual bool additionalTest(string lyric) {
29-
return false;
30-
}
3126
public override void SetSinger(USinger singer) => this.singer = singer;
3227
public static string? FindInOto(USinger singer, string phoneme, Note note, bool nullIfNotFound = false) {
3328
// 음소와 노트를 입력받고, 다음계 및 보이스컬러 에일리어스를 적용한다.
@@ -130,7 +125,6 @@ public Result GenerateResult(String firstPhoneme, String secondPhoneme, int tota
130125
position = totalDuration - totalDuration / totalDurationDivider},
131126
}
132127
};
133-
134128
}
135129

136130
/// <summary>
@@ -298,15 +292,14 @@ public override Result Process(Note[] notes, Note? prev, Note? next, Note? prevN
298292
phonemes = phonemes
299293
};
300294
}
301-
else if (KoreanPhonemizerUtil.IsHangeul(lyric) || !KoreanPhonemizerUtil.IsHangeul(lyric) && additionalTest(lyric)) {
295+
else if (KoreanPhonemizerUtil.IsHangeul(lyric)) {
302296
return ConvertPhonemes(notes, prev, next, prevNeighbour, nextNeighbour, prevNeighbours);
303297
}
304298
else {
305299
return GenerateEndSound(notes, prev, next, prevNeighbour, nextNeighbour, prevNeighbours);
306300
}
307301
}
308302

309-
310303
/// <summary>
311304
/// abstract class for Ini Management
312305
/// To use, child phonemizer should implement this class(BaseIniManager) with its own setting values!

0 commit comments

Comments
 (0)