Fix error with reading duet-tags.
This commit is contained in:
1 parent
34356f351a
commit
1ff2182df6
3 files changed
+36
-15
No files matched your search
+18
-15
@@ -371,29 +371,16 @@ namespace Vocaluxe.Lib.Song
|
|||||||
CheckFiles();
|
CheckFiles();
|
||||||
|
|
||||||
//Before saving this tags to .txt: Check, if ArtistSorting and Artist are equal, then don't save this tag.
|
//Before saving this tags to .txt: Check, if ArtistSorting and Artist are equal, then don't save this tag.
|
||||||
if (this.ArtistSorting == "")
|
if (this.ArtistSorting == String.Empty)
|
||||||
{
|
{
|
||||||
this.ArtistSorting = this.Artist;
|
this.ArtistSorting = this.Artist;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (this.TitleSorting == "")
|
if (this.TitleSorting == String.Empty)
|
||||||
{
|
{
|
||||||
this.TitleSorting = this.Title;
|
this.TitleSorting = this.Title;
|
||||||
}
|
}
|
||||||
|
|
||||||
//Check if Duet-Tags are set
|
|
||||||
if (IsDuet)
|
|
||||||
{
|
|
||||||
if (DuetPart1 == String.Empty)
|
|
||||||
{
|
|
||||||
DuetPart1 = "Part 1";
|
|
||||||
}
|
|
||||||
if (DuetPart2 == String.Empty)
|
|
||||||
{
|
|
||||||
DuetPart2 = "Part 2";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -534,6 +521,8 @@ namespace Vocaluxe.Lib.Song
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
_NotesLoaded = true;
|
_NotesLoaded = true;
|
||||||
|
if(IsDuet)
|
||||||
|
CheckDuet();
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -599,5 +588,19 @@ namespace Vocaluxe.Lib.Song
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void CheckDuet()
|
||||||
|
{
|
||||||
|
if (DuetPart1 == String.Empty)
|
||||||
|
{
|
||||||
|
DuetPart1 = "Part 1";
|
||||||
|
CLog.LogError("Warning: Can't find #P1-tag for duets in \"" + this.Artist + " - " + this.Title + "\".");
|
||||||
|
}
|
||||||
|
if (DuetPart2 == String.Empty)
|
||||||
|
{
|
||||||
|
DuetPart2 = "Part 2";
|
||||||
|
CLog.LogError("Warning: Can't find #P2-tag for duets in \"" + this.Artist + " - " + this.Title + "\".");
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -13,6 +13,8 @@ namespace Vocaluxe.Menu.SongMenu
|
|||||||
class CSongMenuDreidel : CSongMenuFramework
|
class CSongMenuDreidel : CSongMenuFramework
|
||||||
{
|
{
|
||||||
private SRectF _ScrollRect;
|
private SRectF _ScrollRect;
|
||||||
|
private CStatic _CoverBig;
|
||||||
|
private CStatic _TextBG;
|
||||||
|
|
||||||
private CStatic _DuetIcon;
|
private CStatic _DuetIcon;
|
||||||
private CStatic _VideoIcon;
|
private CStatic _VideoIcon;
|
||||||
@@ -27,5 +29,20 @@ namespace Vocaluxe.Menu.SongMenu
|
|||||||
{
|
{
|
||||||
return _actualSelection;
|
return _actualSelection;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public override void Init()
|
||||||
|
{
|
||||||
|
base.Init();
|
||||||
|
/**
|
||||||
|
_CoverBig = _Theme.songMenuDreidel.StaticCoverBig;
|
||||||
|
_TextBG = _Theme.songMenuDreidel.StaticTextBG;
|
||||||
|
_DuetIcon = _Theme.songMenuDreidel.StaticDuetIcon;
|
||||||
|
_VideoIcon = _Theme.songMenuDreidel.StaticVideoIcon;
|
||||||
|
|
||||||
|
_Artist = _Theme.songMenuDreidel.TextArtist;
|
||||||
|
_Title = _Theme.songMenuDreidel.TextTitle;
|
||||||
|
_SongLength = _Theme.songMenuDreidel.TextSongLength;
|
||||||
|
**/
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -589,6 +589,7 @@ namespace Vocaluxe.Screens
|
|||||||
}
|
}
|
||||||
if (CGame.GetNumSongs() == 1 && CGame.GetSong(1).IsDuet)
|
if (CGame.GetNumSongs() == 1 && CGame.GetSong(1).IsDuet)
|
||||||
{
|
{
|
||||||
|
SelectSlides[htSelectSlides(SelectSlideDuetPlayer[i])].Clear();
|
||||||
if (i + 1 <= CGame.NumPlayer)
|
if (i + 1 <= CGame.NumPlayer)
|
||||||
SelectSlides[htSelectSlides(SelectSlideDuetPlayer[i])].Visible = true;
|
SelectSlides[htSelectSlides(SelectSlideDuetPlayer[i])].Visible = true;
|
||||||
else
|
else
|
||||||
|
|||||||
Reference in new issue
Block a user