Don't ignore Medley Tags

This commit is contained in:
Flamefire committed 2014-12-31 18:40:34 +01:00
1 parent 61e275af76
commit be8fb53ecc
2 files changed
+12 -9

No files matched your search

+10 -8
View File
@@ -402,7 +402,7 @@ namespace VocaluxeLib.Songs
return series; return series;
} }
private void _FindRefrain() private void _CalcMedley()
{ {
if (IsDuet) if (IsDuet)
{ {
@@ -410,7 +410,7 @@ namespace VocaluxeLib.Songs
return; return;
} }
if (!_CalculateMedley) if (!_CalculateMedley || Medley.Source != EDataSource.None)
return; return;
List<SSeries> series = _GetSeries(); List<SSeries> series = _GetSeries();
@@ -458,14 +458,16 @@ namespace VocaluxeLib.Songs
Medley.FadeOutTime = CBase.Settings.GetDefaultMedleyFadeOutTime(); Medley.FadeOutTime = CBase.Settings.GetDefaultMedleyFadeOutTime();
} }
} }
}
if (Preview.Source == EDataSource.None) private void _CheckPreview()
{
if (Preview.Source != EDataSource.None)
return;
if (Medley.Source != EDataSource.None)
{ {
if (Medley.Source != EDataSource.None) Preview.StartTime = CBase.Game.GetTimeFromBeats(Medley.StartBeat, BPM);
{ Preview.Source = EDataSource.Calculated;
Preview.StartTime = CBase.Game.GetTimeFromBeats(Medley.StartBeat, BPM);
Preview.Source = EDataSource.Calculated;
}
} }
} }
+2 -1
View File
@@ -743,7 +743,8 @@ namespace VocaluxeLib.Songs
sr.Dispose(); sr.Dispose();
try try
{ {
_Song._FindRefrain(); _Song._CalcMedley();
_Song._CheckPreview();
_Song._FindShortEnd(); _Song._FindShortEnd();
_Song.NotesLoaded = true; _Song.NotesLoaded = true;
if (_Song.IsDuet) if (_Song.IsDuet)