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

Merge branch 'develop' of github.com:Vocaluxe/Vocaluxe into player-guid

Browse Source
This commit is contained in:
Florian Küpper committed 2017-11-23 16:35:16 +01:00
2 parents 86dc259c17 7bf77b66cc
commit d140c2311a
15 files changed
+267 -49
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Output/Languages/English.xml
+1
View File
@@ -188,6 +188,7 @@
<string name="TR_SCREENOGAME_SONGMENU">Song-menu style</string>
<string name="TR_SCREENOGAME_SONGSORTING">Song sorting</string>
<string name="TR_SCREENOGAME_TABS">Tabs</string>
<string name="TR_SCREENOGAME_AUTOPLAYPREVIEWS">Autoplay song previews</string>
<string name="TR_SCREENOGAME_DIFFICULTY">Game difficulty</string>
<string name="TR_SCREENOGAME_TIMERMODE">Timer mode</string>
<string name="TR_SCREENOGAME_HIGHSCORESTYLE">Highscore style</string>
Output/Languages/Swedish.xml
+1
View File
@@ -183,6 +183,7 @@
<string name="TR_SCREENOGAME_SONGMENU">Låtmeny</string>
<string name="TR_SCREENOGAME_SONGSORTING">Låtsortering</string>
<string name="TR_SCREENOGAME_TABS">Flikar</string>
<string name="TR_SCREENOGAME_AUTOPLAYPREVIEWS">Förhandsvisa låtar automatiskt</string>
<string name="TR_SCREENOGAME_DIFFICULTY">Spelets svårighetsgrad</string>
<string name="TR_SCREENOGAME_TIMERMODE">Timerläge</string>
<string name="TR_SCREENOGAME_HIGHSCORESTYLE">Topplistsvy</string>
Output/Themes/Changelog/Changelog_ScreenOptionsGame.txt
+5
View File
@@ -1,5 +1,10 @@
ScreenOptionsGame
++++++++++
Version 4:
Add:
<SelectSlideAutoplayPreviews>
++++++++++
Version 3:
Output/Themes/Genius/Screens/ScreenOptionsGame.xml
+61 -5
View File
@@ -2,7 +2,7 @@
<Screen xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<Informations>
<ScreenName>ScreenOptionsGame</ScreenName>
<ScreenVersion>3</ScreenVersion>
<ScreenVersion>4</ScreenVersion>
</Informations>
<Backgrounds>
<Background Name="Background1">
@@ -111,7 +111,7 @@
<Font>Outline</Font>
<Text>TR_SCREENOGAME_TABS</Text>
</Text>
<Text Name="TextTimerMode">
<Text Name="TextAutoplayPreviews">
<X>75</X>
<Y>407</Y>
<Z>0</Z>
@@ -123,11 +123,25 @@
<ResizeAlign>Center</ResizeAlign>
<Style>Bold</Style>
<Font>Outline</Font>
<Text>TR_SCREENOGAME_AUTOPLAYPREVIEWS</Text>
</Text>
<Text Name="TextTimerMode">
<X>75</X>
<Y>467</Y>
<Z>0</Z>
<H>27</H>
<MaxW>0</MaxW>
<Color Name="TextColor" />
<SelColor Name="TextSelColor" />
<Align>Left</Align>
<ResizeAlign>Center</ResizeAlign>
<Style>Bold</Style>
<Font>Outline</Font>
<Text>TR_SCREENOGAME_TIMERMODE</Text>
</Text>
<Text Name="TextHighScoreStyle">
<X>75</X>
<Y>467</Y>
<Y>527</Y>
<Z>0</Z>
<H>27</H>
<MaxW>0</MaxW>
@@ -425,7 +439,7 @@
<TextStyle>Bold</TextStyle>
<NumVisible>2</NumVisible>
</SelectSlide>
<SelectSlide Name="SelectSlideTimerMode">
<SelectSlide Name="SelectSlideAutoplayPreviews">
<Skin/>
<SkinArrowLeft>SelectSlideArrowLeft</SkinArrowLeft>
<SkinArrowRight>SelectSlideArrowRight</SkinArrowRight>
@@ -467,7 +481,7 @@
<TextStyle>Bold</TextStyle>
<NumVisible>3</NumVisible>
</SelectSlide>
<SelectSlide Name="SelectSlideHighscoreStyle">
<SelectSlide Name="SelectSlideTimerMode">
<Skin/>
<SkinArrowLeft>SelectSlideArrowLeft</SkinArrowLeft>
<SkinArrowRight>SelectSlideArrowRight</SkinArrowRight>
@@ -509,6 +523,48 @@
<TextStyle>Bold</TextStyle>
<NumVisible>2</NumVisible>
</SelectSlide>
<SelectSlide Name="SelectSlideHighscoreStyle">
<Skin/>
<SkinArrowLeft>SelectSlideArrowLeft</SkinArrowLeft>
<SkinArrowRight>SelectSlideArrowRight</SkinArrowRight>
<SkinSelected>SelectSlide</SkinSelected>
<SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
<SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
<Rect>
<X>500</X>
<Y>520</Y>
<W>715</W>
<H>50</H>
<Z>0</Z>
</Rect>
<RectArrowLeft>
<X>505</X>
<Y>525</Y>
<W>40</W>
<H>40</H>
<Z>0</Z>
</RectArrowLeft>
<RectArrowRight>
<X>1170</X>
<Y>525</Y>
<W>40</W>
<H>40</H>
<Z>0</Z>
</RectArrowRight>
<Color Name="SelectSlideColor" />
<SelColor Name="SelectSlideSelColor" />
<ArrowColor Name="ArrowColor" />
<ArrowSelColor Name="ArrowSelColor" />
<TextColor Name="TextColorAlpha" />
<TextSelColor Name="TextSelColor" />
<TextH>27</TextH>
<TextRelativeX>50</TextRelativeX>
<TextRelativeY>0</TextRelativeY>
<TextMaxW>200</TextMaxW>
<TextFont>Outline</TextFont>
<TextStyle>Bold</TextStyle>
<NumVisible>2</NumVisible>
</SelectSlide>
</SelectSlides>
<SingNotes />
<NameSelections />
Vocaluxe/Base/CConfig.cs
+33 -11
View File
@@ -171,6 +171,8 @@ namespace Vocaluxe.Base
[DefaultValue(ETimerMode.TR_CONFIG_TIMERMODE_REMAINING)] public ETimerMode TimerMode;
[XmlAltName("NumPlayer"), DefaultValue(2)] public int NumPlayers;
[DefaultValue(EOffOn.TR_CONFIG_OFF)] public EOffOn Tabs;
[DefaultValue(EOffOn.TR_CONFIG_OFF)] public EOffOn AutoplayPreviews;
[XmlAltName("AutoplayPreviewDelay"), DefaultValue(500)] public int AutoplayPreviewDelay;
[DefaultValue(ELyricsPosition.TR_CONFIG_LYRICSPOSITION_BOTTOM)] public ELyricsPosition LyricsPosition;
[DefaultValue(0.1f)] public float MinLineBreakTime; //Minimum time to show the text before it is (to be) sung (if possible)
[XmlArrayItem("Player"), XmlArray] public string[] Players;
@@ -234,13 +236,14 @@ namespace Vocaluxe.Base
public static event OnSongMenuChanged SongMenuChanged;
//Folders
//We need full path for folders for matching folder path with textfile path when loading
public static readonly List<string> SongFolders = new List<string>
{
#if INSTALLER
Path.Combine(CSettings.DataFolder, CSettings.FolderNameSongs),
CSettings.FolderNameSongs
Path.Combine(CSettings.ProgramFolder, FolderNameSongs)
#elif WIN
CSettings.FolderNameSongs
Path.Combine(CSettings.ProgramFolder, CSettings.FolderNameSongs)
#elif LINUX
Path.Combine(CSettings.DataFolder, CSettings.FolderNameSongs)
#endif
@@ -378,15 +381,7 @@ namespace Vocaluxe.Base
else
Config = xml.DeserializeString<SConfig>("<root />");
if (Config.Game.SongFolder.Length > 0 && Config.Game.SongFolder[0] != "")
{
SongFolders.Clear();
SongFolders.AddRange(Config.Game.SongFolder);
}
else
{
Config.Game.SongFolder = SongFolders.ToArray();
}
NormalizeSongPaths();
if (Config.Game.MinLineBreakTime < 0)
Config.Game.MinLineBreakTime = 0.1f;
@@ -521,6 +516,10 @@ namespace Vocaluxe.Base
return "NumPlayers: 1.." + CSettings.MaxNumPlayer;
case "Tabs":
return "Order songs in tabs: " + CHelper.ListStrings(Enum.GetNames(typeof(EOffOn)));
case "AutoplayPreviews":
return "Automatically play song preview when selected: " + CHelper.ListStrings(Enum.GetNames(typeof(EOffOn)));
case "AutoplayPreviewDelay":
return "Delay before playback of autoplay previews is started in milliseconds";
case "LyricsPosition":
return "Position if lyrics on screen: " + CHelper.ListStrings(Enum.GetNames(typeof(ELyricsPosition)));
case "MinLineBreakTime":
@@ -674,6 +673,29 @@ namespace Vocaluxe.Base
return false;
}
/// <summary>
/// Set song path if none is find in config and check if every path exists
/// </summary>
public static void NormalizeSongPaths()
{
//Check if there are configured songfolders
if (Config.Game.SongFolder.Length > 0 && Config.Game.SongFolder[0] != "")
{
SongFolders.Clear();
foreach (string folder in Config.Game.SongFolder)
{
//Check if folder exists
if (Directory.Exists(folder))
SongFolders.Add(folder);
}
}
//Test if songfolders are still empty or now empty
if(Config.Game.SongFolder.Length == 0)
Config.Game.SongFolder = SongFolders.ToArray();
}
/// <summary>
/// Load command-line-parameters and their values to lists.
/// </summary>
Vocaluxe/Base/CMain.cs
+10
View File
@@ -141,6 +141,16 @@ namespace Vocaluxe.Base
return CConfig.Config.Game.Tabs;
}
public EOffOn GetAutoplayPreviews()
{
return CConfig.Config.Game.AutoplayPreviews;
}
public int GetAutoplayPreviewDelay()
{
return CConfig.Config.Game.AutoplayPreviewDelay;
}
public EOffOn GetIgnoreArticles()
{
return CConfig.Config.Game.IgnoreArticles;
Vocaluxe/Base/CProfiles.cs
+9 -3
View File
@@ -19,6 +19,7 @@ using System;
using System.Collections.Generic;
using System.Linq;
using System.IO;
using System.Text.RegularExpressions;
using VocaluxeLib;
using VocaluxeLib.Draw;
using VocaluxeLib.Profile;
@@ -296,7 +297,7 @@ namespace Vocaluxe.Base
return new CProfile[0];
var list = new List<CProfile>(_Profiles.Values);
list.Sort(_CompareByPlayerName);
list.Sort(_AlphaNumericCompareByPlayerName);
return list.ToArray();
}
@@ -638,9 +639,14 @@ namespace Vocaluxe.Base
_ProfilesChanged = true;
}
private static int _CompareByPlayerName(CProfile a, CProfile b)
private static int _AlphaNumericCompareByPlayerName(CProfile a, CProfile b)
{
return String.CompareOrdinal(a.PlayerName, b.PlayerName);
return _PadNumbersInString(a.PlayerName).CompareTo(_PadNumbersInString(b.PlayerName));
}
private static string _PadNumbersInString(string text)
{
return Regex.Replace(text, "[0-9]+", match => match.Value.PadLeft(4, '0'));
}
public static CAvatar GetAvatarByFilename(string fileName)
Vocaluxe/Base/CVideoPlayer.cs
+17 -3
View File
@@ -53,6 +53,10 @@ namespace Vocaluxe.Base
{
_VideoTimer.Reset();
_Finished = false;
if (_VideoStream == null)
{
return;
}
//CVideo.VdSkip(_VideoStream, 0f, 0f);
_VideoTimer.Start();
CVideo.Resume(_VideoStream);
@@ -60,12 +64,19 @@ namespace Vocaluxe.Base
public void Pause()
{
CVideo.Pause(_VideoStream);
if (_VideoStream != null)
{
CVideo.Pause(_VideoStream);
}
_VideoTimer.Stop();
}
public void Resume()
{
if (_VideoStream == null)
{
return;
}
CVideo.Resume(_VideoStream);
_VideoTimer.Start();
}
@@ -92,7 +103,7 @@ namespace Vocaluxe.Base
public void PreLoad()
{
if (!_Loaded)
if (!_Loaded || _VideoStream == null)
{
return;
}
@@ -111,7 +122,10 @@ namespace Vocaluxe.Base
public void Close()
{
CVideo.Close(ref _VideoStream);
if (_VideoStream != null)
{
CVideo.Close(ref _VideoStream);
}
_Loaded = false;
_Finished = false;
_VideoTimer.Reset();
Vocaluxe/Screens/CScreenNames.cs
+1
View File
@@ -669,6 +669,7 @@ namespace Vocaluxe.Screens
_Texts["TextPlayer" + i].Visible = false;
_Equalizers["EqualizerPlayer" + i].Visible = false;
_SelectSlides["SelectSlideDuetPlayer" + i].Visible = false;
_ResetPlayerSelection(i - 1);
}
}
CConfig.SaveConfig();
Vocaluxe/Screens/CScreenOptionsGame.cs
+4 -1
View File
@@ -27,7 +27,7 @@ namespace Vocaluxe.Screens
// Version number for theme files. Increment it, if you've changed something on the theme files!
protected override int _ScreenVersion
{
get { return 3; }
get { return 4; }
}
private const string _SelectSlideLanguage = "SelectSlideLanguage";
@@ -35,6 +35,7 @@ namespace Vocaluxe.Screens
private const string _SelectSlideSongMenu = "SelectSlideSongMenu";
private const string _SelectSlideSongSorting = "SelectSlideSongSorting";
private const string _SelectSlideTabs = "SelectSlideTabs";
private const string _SelectSlideAutoplayPreviews = "SelectSlideAutoplayPreviews";
private const string _SelectSlideTimerMode = "SelectSlideTimerMode";
private const string _SelectSlideHighscoreStyle = "SelectSlideHighscoreStyle";
@@ -60,6 +61,7 @@ namespace Vocaluxe.Screens
_SelectSlides[_SelectSlideSongMenu].SetValues<ESongMenu>((int)CConfig.SongMenu);
_SelectSlides[_SelectSlideSongSorting].SetValues<ESongSorting>((int)CConfig.Config.Game.SongSorting);
_SelectSlides[_SelectSlideTabs].SetValues<EOffOn>((int)CConfig.Config.Game.Tabs);
_SelectSlides[_SelectSlideAutoplayPreviews].SetValues<EOffOn>((int)CConfig.Config.Game.AutoplayPreviews);
_SelectSlides[_SelectSlideTimerMode].SetValues<ETimerMode>((int)CConfig.Config.Game.TimerMode);
_SelectSlides[_SelectSlideHighscoreStyle].SetValues<EHighscoreStyle>((int)CConfig.Config.Game.HighscoreStyle);
}
@@ -142,6 +144,7 @@ namespace Vocaluxe.Screens
CConfig.SongMenu = (ESongMenu)_SelectSlides[_SelectSlideSongMenu].Selection;
CConfig.Config.Game.SongSorting = (ESongSorting)_SelectSlides[_SelectSlideSongSorting].Selection;
CConfig.Config.Game.Tabs = (EOffOn)_SelectSlides[_SelectSlideTabs].Selection;
CConfig.Config.Game.AutoplayPreviews = (EOffOn)_SelectSlides[_SelectSlideAutoplayPreviews].Selection;
CConfig.Config.Game.TimerMode = (ETimerMode)_SelectSlides[_SelectSlideTimerMode].Selection;
CConfig.Config.Game.HighscoreStyle = (EHighscoreStyle)_SelectSlides[_SelectSlideHighscoreStyle].Selection;
Vocaluxe/Screens/CScreenSing.cs
+65 -16
View File
@@ -50,12 +50,12 @@ namespace Vocaluxe.Screens
private const string _TextSongName = "TextSongName";
private const string _TextTime = "TextTime";
private const string _TextPause = "TextPause";
private const string _TextDuetName1 = "TextDuetName1";
private const string _TextDuetName2 = "TextDuetName2";
private const string _TextMedleyCountdown = "TextMedleyCountdown";
private string[,,] _TextScores;
private string[,,] _TextNames;
private List<string> _TextsPause;
private const string _StaticSongText = "StaticSongText";
private const string _StaticLyrics = "StaticLyrics";
@@ -69,7 +69,7 @@ namespace Vocaluxe.Screens
private const string _StaticLyricHelper = "StaticLyricHelper";
private const string _StaticLyricHelperDuet = "StaticLyricHelperDuet";
private const string _StaticLyricHelperTop = "StaticLyricHelperTop";
private const string _StaticPauseBG = "StaticPauseBG";
private List<string> _StaticsPause;
private string[,,] _StaticScores;
private string[,,] _StaticAvatars;
@@ -139,7 +139,7 @@ namespace Vocaluxe.Screens
{
base.Init();
var texts = new List<string> { _TextSongName, _TextTime, _TextPause, _TextDuetName1, _TextDuetName2, _TextMedleyCountdown };
var texts = new List<string> { _TextSongName, _TextTime, _TextDuetName1, _TextDuetName2, _TextMedleyCountdown };
_BuildTextStrings(texts);
_ThemeTexts = texts.ToArray();
@@ -156,9 +156,8 @@ namespace Vocaluxe.Screens
_StaticTimePointer,
_StaticLyricHelper,
_StaticLyricHelperDuet,
_StaticLyricHelperTop,
_StaticPauseBG
};
_StaticLyricHelperTop
};
_BuildStaticStrings(ref statics);
_ThemeStatics = statics.ToArray();
@@ -181,6 +180,21 @@ namespace Vocaluxe.Screens
_TimerDuetText2 = new Stopwatch();
}
public override void LoadTheme(string xmlPath)
{
base.LoadTheme(xmlPath);
_StaticsPause = new List<string>();
_TextsPause = new List<string>();
//Automatically find statics and texts with pause prefix
foreach (CStatic s in _Statics.Where(s => s.ThemeLoaded && s.GetThemeName().StartsWith("StaticPause")))
_StaticsPause.Add(s.GetThemeName());
foreach (CText t in _Texts.Where(s => s.ThemeLoaded && s.GetThemeName().StartsWith("TextPause")))
_TextsPause.Add(t.GetThemeName());
}
public override bool HandleInput(SKeyEvent keyEvent)
{
base.HandleInput(keyEvent);
@@ -226,7 +240,7 @@ namespace Vocaluxe.Screens
if (CGame.NumRounds > CGame.RoundNr)
{
if (keyEvent.ModCtrl)
_LoadNextSong();
_NextSong();
}
break;
case Keys.W:
@@ -248,7 +262,7 @@ namespace Vocaluxe.Screens
_Stop();
if (_Buttons[_ButtonSkip].Selected)
{
_LoadNextSong();
_NextSong();
_SetPause(false);
}
}
@@ -293,7 +307,7 @@ namespace Vocaluxe.Screens
if (_Buttons[_ButtonSkip].Selected)
{
_LoadNextSong();
_NextSong();
_SetPause(false);
}
}
@@ -316,7 +330,7 @@ namespace Vocaluxe.Screens
finish = true;
if (finish && !_FadeOut)
_LoadNextSong();
_NextSong();
_UpdateSongText();
_UpdateDuetNames();
@@ -449,7 +463,7 @@ namespace Vocaluxe.Screens
base.OnShowFinish();
CGame.Start();
_LoadNextSong();
_NextSong();
}
public override void Draw()
@@ -533,12 +547,40 @@ namespace Vocaluxe.Screens
_Texts[_TextMedleyCountdown].Text = String.Empty;
}
private void _LoadNextSong()
private void _RestartRound()
{
_CloseSong();
CGame.ResetPlayer();
_LoadCurrentSong();
_StartSong();
}
private void _RestartGame()
{
_CloseSong();
CGame.Reset();
CGame.ResetPlayer();
CGame.NextRound();
_LoadCurrentSong();
_StartSong();
}
private void _NextSong()
{
_CloseSong();
CGame.NextRound();
_LoadCurrentSong();
_StartSong();
}
private void _LoadCurrentSong()
{
if (CGame.IsFinished())
{
_FinishedSinging();
@@ -640,8 +682,6 @@ namespace Vocaluxe.Screens
if (!song.IsDuet)
_TimerSongText.Start();
_StartSong();
}
private void _SetNormalLyricsVisibility()
@@ -689,7 +729,10 @@ namespace Vocaluxe.Screens
{
//Need this to set other songs to points-var
while (!CGame.IsFinished())
{
CGame.NextRound();
CGame.ResetPlayer();
}
_FinishedSinging();
}
@@ -826,11 +869,17 @@ namespace Vocaluxe.Screens
private void _SetPause(bool paused)
{
_Pause = paused;
_Statics[_StaticPauseBG].Visible = _Pause;
_Texts[_TextPause].Visible = _Pause;
foreach(String s in _StaticsPause)
_Statics[s].Visible = _Pause;
foreach(String s in _TextsPause)
_Texts[s].Visible = _Pause;
_Buttons[_ButtonCancel].Visible = _Pause;
_Buttons[_ButtonContinue].Visible = _Pause;
_Buttons[_ButtonSkip].Visible = _Pause && CGame.NumRounds > CGame.RoundNr && CGame.NumRounds > 1;
if (_Pause)
CSound.Pause(_CurrentStream);
else
VocaluxeLib/IBasic.cs
+2
View File
@@ -56,6 +56,8 @@ namespace VocaluxeLib
IEnumerable<string> GetSongFolders();
ESongSorting GetSongSorting();
EOffOn GetTabs();
EOffOn GetAutoplayPreviews();
int GetAutoplayPreviewDelay();
EOffOn GetIgnoreArticles();
bool IsMicConfigured(int playerNr);
VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs
+40
View File
@@ -158,6 +158,9 @@ namespace VocaluxeLib.Menu.SongMenu
}
}
protected int _AutoplayDelayinMs = CBase.Config.GetAutoplayPreviewDelay();
protected System.Timers.Timer _AutoplayTimer = new System.Timers.Timer();
private SColorF _ColorInternal;
protected SColorF _Color
{
@@ -204,6 +207,7 @@ namespace VocaluxeLib.Menu.SongMenu
public virtual void Init()
{
_ResetPreview(false);
_InitializeAutoplayTimer();
_Initialized = true;
}
@@ -358,6 +362,42 @@ namespace VocaluxeLib.Menu.SongMenu
_PreviewNrInternal = -1;
}
protected void _PreviewSelectedSong()
{
_PreviewNr = _SelectionNr;
}
protected void _InitializeAutoplayTimer()
{
_AutoplayTimer.Interval = _AutoplayDelayinMs;
_AutoplayTimer.AutoReset = false;
_AutoplayTimer.Elapsed += (object sender, System.Timers.ElapsedEventArgs e) =>
{
_PreviewSelectedSong();
};
}
protected void _AutoplayPreviewIfEnabled()
{
if (CBase.Config.GetAutoplayPreviews() == EOffOn.TR_CONFIG_ON)
{
_PlayPreviewAfterDelay();
}
}
protected void _PlayPreviewAfterDelay()
{
if (!_AutoplayTimer.Enabled)
{
_AutoplayTimer.Start();
}
else
{
_AutoplayTimer.Stop();
_AutoplayTimer.Start();
}
}
#region ThemeEdit
public void MoveElement(int stepX, int stepY)
{
VocaluxeLib/Menu/SongMenu/CSongMenuList.cs
+9 -5
View File
@@ -204,7 +204,7 @@ namespace VocaluxeLib.Menu.SongMenu
public override void Update(SScreenSongOptions songOptions)
{
if (songOptions.Selection.RandomOnly)
_PreviewNr = _SelectionNr;
_PreviewSelectedSong();
if (_Length < 0 && CBase.Songs.IsInCategory() && CBase.BackgroundMusic.GetLength() > 0)
_UpdateLength(CBase.Songs.GetVisibleSong(_PreviewNr));
@@ -300,7 +300,7 @@ namespace VocaluxeLib.Menu.SongMenu
SetSelectedSong(_SelectionNr < 0 ? 0 : _SelectionNr);
else
SetSelectedCategory(_SelectionNr < 0 ? 0 : _SelectionNr);
_PreviewNr = _SelectionNr;
_PreviewSelectedSong();
_UpdateListIfRequired();
}
@@ -323,7 +323,7 @@ namespace VocaluxeLib.Menu.SongMenu
{
if (_SelectionNr >= 0 && _PreviewNr != _SelectionNr)
{
_PreviewNr = _SelectionNr;
_PreviewSelectedSong();
keyEvent.Handled = true;
}
}
@@ -364,6 +364,7 @@ namespace VocaluxeLib.Menu.SongMenu
if (_SelectionNr > 0 && moveAllowed)
{
_SelectionNr--;
_AutoplayPreviewIfEnabled();
keyEvent.Handled = true;
}
break;
@@ -372,6 +373,7 @@ namespace VocaluxeLib.Menu.SongMenu
if (moveAllowed)
{
_SelectionNr++;
_AutoplayPreviewIfEnabled();
keyEvent.Handled = true;
}
break;
@@ -388,6 +390,7 @@ namespace VocaluxeLib.Menu.SongMenu
else if (_SelectionNr >= 1 && moveAllowed)
{
_SelectionNr -= 1;
_AutoplayPreviewIfEnabled();
keyEvent.Handled = true;
}
break;
@@ -404,12 +407,13 @@ namespace VocaluxeLib.Menu.SongMenu
else if (moveAllowed)
{
_SelectionNr += 1;
_AutoplayPreviewIfEnabled();
keyEvent.Handled = true;
}
break;
}
if (!CBase.Songs.IsInCategory())
_PreviewNr = _SelectionNr;
_PreviewSelectedSong();
return keyEvent.Handled;
}
@@ -469,7 +473,7 @@ namespace VocaluxeLib.Menu.SongMenu
{
if (_PreviewNr == _SelectionNr)
return false;
_PreviewNr = _SelectionNr;
_PreviewSelectedSong();
}
else
EnterSelectedCategory();
VocaluxeLib/Menu/SongMenu/CSongMenuTileBoard.cs
+9 -5
View File
@@ -195,7 +195,7 @@ namespace VocaluxeLib.Menu.SongMenu
public override void Update(SScreenSongOptions songOptions)
{
if (songOptions.Selection.RandomOnly)
_PreviewNr = _SelectionNr;
_PreviewSelectedSong();
if (_Length < 0 && CBase.Songs.IsInCategory() && CBase.BackgroundMusic.GetLength() > 0)
_UpdateLength(CBase.Songs.GetVisibleSong(_PreviewNr));
@@ -291,7 +291,7 @@ namespace VocaluxeLib.Menu.SongMenu
SetSelectedSong(_SelectionNr < 0 ? 0 : _SelectionNr);
else
SetSelectedCategory(_SelectionNr < 0 ? 0 : _SelectionNr);
_PreviewNr = _SelectionNr;
_PreviewSelectedSong();
_UpdateListIfRequired();
}
@@ -314,7 +314,7 @@ namespace VocaluxeLib.Menu.SongMenu
{
if (_SelectionNr >= 0 && _PreviewNr != _SelectionNr)
{
_PreviewNr = _SelectionNr;
_PreviewSelectedSong();
keyEvent.Handled = true;
}
}
@@ -355,6 +355,7 @@ namespace VocaluxeLib.Menu.SongMenu
if (_SelectionNr > 0 && moveAllowed)
{
_SelectionNr--;
_AutoplayPreviewIfEnabled();
keyEvent.Handled = true;
}
break;
@@ -363,6 +364,7 @@ namespace VocaluxeLib.Menu.SongMenu
if (moveAllowed)
{
_SelectionNr++;
_AutoplayPreviewIfEnabled();
keyEvent.Handled = true;
}
break;
@@ -379,6 +381,7 @@ namespace VocaluxeLib.Menu.SongMenu
else if (_SelectionNr >= _NumW && moveAllowed)
{
_SelectionNr -= _NumW;
_AutoplayPreviewIfEnabled();
keyEvent.Handled = true;
}
break;
@@ -395,12 +398,13 @@ namespace VocaluxeLib.Menu.SongMenu
else if (moveAllowed)
{
_SelectionNr += _NumW;
_AutoplayPreviewIfEnabled();
keyEvent.Handled = true;
}
break;
}
if (!CBase.Songs.IsInCategory())
_PreviewNr = _SelectionNr;
_PreviewSelectedSong();
return keyEvent.Handled;
}
@@ -456,7 +460,7 @@ namespace VocaluxeLib.Menu.SongMenu
{
if (_PreviewNr == _SelectionNr)
return false;
_PreviewNr = _SelectionNr;
_PreviewSelectedSong();
}
else
EnterSelectedCategory();