Projects/Vocaluxe
2
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Support relative songs

Browse Source
This commit is contained in:
Flamefire committed 2013-02-11 17:49:17 +01:00
1 parent 748d9929b5
commit 75451a0a17
1 file changed
+15 -9
Download Patch File Download Diff File Expand all files Collapse all files
VocaluxeLib/Menu/SongMenu/CSong.cs
+15 -9
View File
@@ -562,12 +562,6 @@ namespace Vocaluxe.Menu.SongMenu
return false; return false;
} }
if (this.Relative == EOffOn.TR_CONFIG_ON)
{
_Base.Log.LogError("Relative songs are not supported by Vocaluxe (perhaps later)! (" + FilePath + ")");
return false;
}
#region check medley tags #region check medley tags
if ((HeaderFlags & EHeaderFlags.MedleyStartBeat) != 0 && (HeaderFlags & EHeaderFlags.MedleyEndBeat) != 0) if ((HeaderFlags & EHeaderFlags.MedleyStartBeat) != 0 && (HeaderFlags & EHeaderFlags.MedleyEndBeat) != 0)
{ {
@@ -637,6 +631,7 @@ namespace Vocaluxe.Menu.SongMenu
int Param1 = 0; int Param1 = 0;
int Param2 = 0; int Param2 = 0;
int Param3 = 0; int Param3 = 0;
int currentPos = 0;
string ParamS = String.Empty; string ParamS = String.Empty;
bool isNewSentence = false; bool isNewSentence = false;
@@ -703,14 +698,17 @@ namespace Vocaluxe.Menu.SongMenu
chr = (char)sr.Read(); chr = (char)sr.Read();
ParamS = sr.ReadLine(); ParamS = sr.ReadLine();
ENoteType NoteType = ENoteType.Normal; ENoteType NoteType;
if (TempC.CompareTo('*') == 0) if (TempC.CompareTo('*') == 0)
NoteType = ENoteType.Golden; NoteType = ENoteType.Golden;
else if (TempC.CompareTo('F') == 0)
if (TempC.CompareTo('F') == 0)
NoteType = ENoteType.Freestyle; NoteType = ENoteType.Freestyle;
else
NoteType = ENoteType.Normal;
if (this.Relative == EOffOn.TR_CONFIG_ON)
Param1 += currentPos;
if (Player != 2) if (Player != 2)
// one singer // one singer
@@ -735,6 +733,14 @@ namespace Vocaluxe.Menu.SongMenu
char chr = (char)sr.Read(); char chr = (char)sr.Read();
Param1 = CHelper.TryReadInt(sr); Param1 = CHelper.TryReadInt(sr);
if (this.Relative == EOffOn.TR_CONFIG_ON)
{
Param1 += currentPos;
chr = (char)sr.Read();
Param2 = CHelper.TryReadInt(sr);
currentPos += Param2;
}
if(Player != 2) if(Player != 2)
// one singer // one singer
NewSentence(Player, Param1); NewSentence(Player, Param1);