Merge branch 'develop' into ScalingFix

This commit is contained in:
Stefan authored and GitHub committed 2020-02-04 14:27:15 +01:00
commit 14b8bbb5cd
1 file changed
+3 -1
+3 -1
View File
@@ -571,6 +571,8 @@ namespace VocaluxeLib.Songs
case ':': case ':':
case '*': case '*':
case 'F': case 'F':
case 'R': // Read R (RAP) and G (Golden RAP) notes as Freestyle notes currently. Final implementation needed!
case 'G': // Read R (RAP) and G (Golden RAP) notes as Freestyle notes currently. Final implementation needed!
string[] noteData = line.Split(splitChars, 4); string[] noteData = line.Split(splitChars, 4);
if (noteData.Length < 4) if (noteData.Length < 4)
{ {
@@ -618,7 +620,7 @@ namespace VocaluxeLib.Songs
if (tag.Equals('*')) if (tag.Equals('*'))
noteType = ENoteType.Golden; noteType = ENoteType.Golden;
else if (tag.Equals('F')) else if (tag.Equals('F') || tag.Equals('R') || tag.Equals('G')) // Read R (RAP) and G (Golden RAP) notes as Freestyle notes currently. Final implementation needed!
noteType = ENoteType.Freestyle; noteType = ENoteType.Freestyle;
else else
noteType = ENoteType.Normal; noteType = ENoteType.Normal;