Fix short-song-mode.

This commit is contained in:
Florian Küpper committed 2014-01-21 19:19:04 +01:00
1 parent 9676c1056f
commit 70f566682f
2 files changed
+4 -1

No files matched your search

+3
View File
@@ -488,9 +488,11 @@ namespace VocaluxeLib.Songs
if (stop < (voice.Lines[series[i].Start].FirstNoteBeat + ((voice.Lines[series[i].End].LastNoteBeat - voice.Lines[series[i].Start].FirstNoteBeat) / 2))) if (stop < (voice.Lines[series[i].Start].FirstNoteBeat + ((voice.Lines[series[i].End].LastNoteBeat - voice.Lines[series[i].Start].FirstNoteBeat) / 2)))
{ {
ShortEnd.EndBeat = voice.Lines[series[i].Start - 1].LastNote.EndBeat; ShortEnd.EndBeat = voice.Lines[series[i].Start - 1].LastNote.EndBeat;
ShortEnd.Source = EDataSource.Calculated;
return; return;
} }
ShortEnd.EndBeat = voice.Lines[series[i].End].LastNote.EndBeat; ShortEnd.EndBeat = voice.Lines[series[i].End].LastNote.EndBeat;
ShortEnd.Source = EDataSource.Calculated;
return; return;
} }
} }
@@ -501,6 +503,7 @@ namespace VocaluxeLib.Songs
if (line.FirstNoteBeat < stop && line.LastNoteBeat > stop) if (line.FirstNoteBeat < stop && line.LastNoteBeat > stop)
{ {
ShortEnd.EndBeat = line.LastNoteBeat; ShortEnd.EndBeat = line.LastNoteBeat;
ShortEnd.Source = EDataSource.Calculated;
return; return;
} }
} }
+1 -1
View File
@@ -309,7 +309,7 @@ namespace VocaluxeLib.Songs
_Song.ShortEnd.Source = EDataSource.Tag; _Song.ShortEnd.Source = EDataSource.Tag;
} }
else else
_LogWarning("Invalid medleyendbeat"); _LogWarning("Invalid shortendbeat");
} }
break; break;
case "CALCMEDLEY": case "CALCMEDLEY":