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

Add a delay before playing preview

Browse Source
This commit is contained in:
Jiiniasu committed 2017-11-07 20:19:43 +01:00
1 parent 8d50d9f8d1
commit dad5f5ec11
2 files changed
+80 -26
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

VocaluxeLib/Menu/SongMenu/CSongMenuList.cs
+40 -13
View File
@@ -64,6 +64,9 @@ namespace VocaluxeLib.Menu.SongMenu
private readonly List<IMenuElement> _SubElements = new List<IMenuElement>(); private readonly List<IMenuElement> _SubElements = new List<IMenuElement>();
private int _AutoplayDelay = 500;
private System.Timers.Timer _AutoplayTimer = new System.Timers.Timer();
public override float SelectedTileZoomFactor public override float SelectedTileZoomFactor
{ {
get { return 1.2f; } get { return 1.2f; }
@@ -204,7 +207,7 @@ namespace VocaluxeLib.Menu.SongMenu
public override void Update(SScreenSongOptions songOptions) public override void Update(SScreenSongOptions songOptions)
{ {
if (songOptions.Selection.RandomOnly) if (songOptions.Selection.RandomOnly)
_PreviewNr = _SelectionNr; _PreviewSelectedSong();
if (_Length < 0 && CBase.Songs.IsInCategory() && CBase.BackgroundMusic.GetLength() > 0) if (_Length < 0 && CBase.Songs.IsInCategory() && CBase.BackgroundMusic.GetLength() > 0)
_UpdateLength(CBase.Songs.GetVisibleSong(_PreviewNr)); _UpdateLength(CBase.Songs.GetVisibleSong(_PreviewNr));
@@ -300,7 +303,7 @@ namespace VocaluxeLib.Menu.SongMenu
SetSelectedSong(_SelectionNr < 0 ? 0 : _SelectionNr); SetSelectedSong(_SelectionNr < 0 ? 0 : _SelectionNr);
else else
SetSelectedCategory(_SelectionNr < 0 ? 0 : _SelectionNr); SetSelectedCategory(_SelectionNr < 0 ? 0 : _SelectionNr);
_PreviewNr = _SelectionNr; _PreviewSelectedSong();
_UpdateListIfRequired(); _UpdateListIfRequired();
} }
@@ -323,7 +326,7 @@ namespace VocaluxeLib.Menu.SongMenu
{ {
if (_SelectionNr >= 0 && _PreviewNr != _SelectionNr) if (_SelectionNr >= 0 && _PreviewNr != _SelectionNr)
{ {
_PreviewNr = _SelectionNr; _PreviewSelectedSong();
keyEvent.Handled = true; keyEvent.Handled = true;
} }
} }
@@ -413,7 +416,7 @@ namespace VocaluxeLib.Menu.SongMenu
break; break;
} }
if (!CBase.Songs.IsInCategory()) if (!CBase.Songs.IsInCategory())
_PreviewNr = _SelectionNr; _PreviewSelectedSong();
return keyEvent.Handled; return keyEvent.Handled;
} }
@@ -473,7 +476,7 @@ namespace VocaluxeLib.Menu.SongMenu
{ {
if (_PreviewNr == _SelectionNr) if (_PreviewNr == _SelectionNr)
return false; return false;
_PreviewNr = _SelectionNr; _PreviewSelectedSong();
} }
else else
EnterSelectedCategory(); EnterSelectedCategory();
@@ -560,14 +563,6 @@ namespace VocaluxeLib.Menu.SongMenu
_UpdateListIfRequired(); _UpdateListIfRequired();
} }
private void _AutoplayPreviewIfEnabled()
{
if(CBase.Config.GetAutoplayPreviews() == EOffOn.TR_CONFIG_ON)
{
_PreviewNr = _SelectionNr;
}
}
private void _NextCategory() private void _NextCategory()
{ {
if (CBase.Songs.IsInCategory()) if (CBase.Songs.IsInCategory())
@@ -586,6 +581,38 @@ namespace VocaluxeLib.Menu.SongMenu
} }
} }
private void _PreviewSelectedSong()
{
_PreviewNr = _SelectionNr;
}
private void _AutoplayPreviewIfEnabled()
{
if (CBase.Config.GetAutoplayPreviews() == EOffOn.TR_CONFIG_ON)
{
_PlayPreviewAfterDelay(_AutoplayDelay);
}
}
private void _PlayPreviewAfterDelay(double delay)
{
if (!_AutoplayTimer.Enabled)
{
_AutoplayTimer = new System.Timers.Timer(delay);
_AutoplayTimer.AutoReset = false;
_AutoplayTimer.Elapsed += (object sender, System.Timers.ElapsedEventArgs e) =>
{
_PreviewSelectedSong();
};
_AutoplayTimer.Start();
}
else
{
_AutoplayTimer.Stop();
_AutoplayTimer.Start();
}
}
private void _UpdateListIfRequired() private void _UpdateListIfRequired()
{ {
int curElements = CBase.Songs.IsInCategory() ? CBase.Songs.GetNumSongsVisible() : CBase.Songs.GetNumCategories(); int curElements = CBase.Songs.IsInCategory() ? CBase.Songs.GetNumSongsVisible() : CBase.Songs.GetNumCategories();
VocaluxeLib/Menu/SongMenu/CSongMenuTileBoard.cs
+40 -13
View File
@@ -60,6 +60,9 @@ namespace VocaluxeLib.Menu.SongMenu
private readonly List<IMenuElement> _SubElements = new List<IMenuElement>(); private readonly List<IMenuElement> _SubElements = new List<IMenuElement>();
private int _AutoplayDelay = 500;
private System.Timers.Timer _AutoplayTimer = new System.Timers.Timer();
public override float SelectedTileZoomFactor public override float SelectedTileZoomFactor
{ {
get { return 1.2f; } get { return 1.2f; }
@@ -195,7 +198,7 @@ namespace VocaluxeLib.Menu.SongMenu
public override void Update(SScreenSongOptions songOptions) public override void Update(SScreenSongOptions songOptions)
{ {
if (songOptions.Selection.RandomOnly) if (songOptions.Selection.RandomOnly)
_PreviewNr = _SelectionNr; _PreviewSelectedSong();
if (_Length < 0 && CBase.Songs.IsInCategory() && CBase.BackgroundMusic.GetLength() > 0) if (_Length < 0 && CBase.Songs.IsInCategory() && CBase.BackgroundMusic.GetLength() > 0)
_UpdateLength(CBase.Songs.GetVisibleSong(_PreviewNr)); _UpdateLength(CBase.Songs.GetVisibleSong(_PreviewNr));
@@ -291,7 +294,7 @@ namespace VocaluxeLib.Menu.SongMenu
SetSelectedSong(_SelectionNr < 0 ? 0 : _SelectionNr); SetSelectedSong(_SelectionNr < 0 ? 0 : _SelectionNr);
else else
SetSelectedCategory(_SelectionNr < 0 ? 0 : _SelectionNr); SetSelectedCategory(_SelectionNr < 0 ? 0 : _SelectionNr);
_PreviewNr = _SelectionNr; _PreviewSelectedSong();
_UpdateListIfRequired(); _UpdateListIfRequired();
} }
@@ -314,7 +317,7 @@ namespace VocaluxeLib.Menu.SongMenu
{ {
if (_SelectionNr >= 0 && _PreviewNr != _SelectionNr) if (_SelectionNr >= 0 && _PreviewNr != _SelectionNr)
{ {
_PreviewNr = _SelectionNr; _PreviewSelectedSong();
keyEvent.Handled = true; keyEvent.Handled = true;
} }
} }
@@ -404,7 +407,7 @@ namespace VocaluxeLib.Menu.SongMenu
break; break;
} }
if (!CBase.Songs.IsInCategory()) if (!CBase.Songs.IsInCategory())
_PreviewNr = _SelectionNr; _PreviewSelectedSong();
return keyEvent.Handled; return keyEvent.Handled;
} }
@@ -460,7 +463,7 @@ namespace VocaluxeLib.Menu.SongMenu
{ {
if (_PreviewNr == _SelectionNr) if (_PreviewNr == _SelectionNr)
return false; return false;
_PreviewNr = _SelectionNr; _PreviewSelectedSong();
} }
else else
EnterSelectedCategory(); EnterSelectedCategory();
@@ -523,14 +526,6 @@ namespace VocaluxeLib.Menu.SongMenu
_UpdateListIfRequired(); _UpdateListIfRequired();
} }
private void _AutoplayPreviewIfEnabled()
{
if (CBase.Config.GetAutoplayPreviews() == EOffOn.TR_CONFIG_ON)
{
_PreviewNr = _SelectionNr;
}
}
private void _NextCategory() private void _NextCategory()
{ {
if (CBase.Songs.IsInCategory()) if (CBase.Songs.IsInCategory())
@@ -549,6 +544,38 @@ namespace VocaluxeLib.Menu.SongMenu
} }
} }
private void _PreviewSelectedSong()
{
_PreviewNr = _SelectionNr;
}
private void _AutoplayPreviewIfEnabled()
{
if (CBase.Config.GetAutoplayPreviews() == EOffOn.TR_CONFIG_ON)
{
_PlayPreviewAfterDelay(_AutoplayDelay);
}
}
private void _PlayPreviewAfterDelay(double delay)
{
if (!_AutoplayTimer.Enabled)
{
_AutoplayTimer = new System.Timers.Timer(delay);
_AutoplayTimer.AutoReset = false;
_AutoplayTimer.Elapsed += (object sender, System.Timers.ElapsedEventArgs e) =>
{
_PreviewSelectedSong();
};
_AutoplayTimer.Start();
}
else
{
_AutoplayTimer.Stop();
_AutoplayTimer.Start();
}
}
private void _UpdateListIfRequired() private void _UpdateListIfRequired()
{ {
int curElements = CBase.Songs.IsInCategory() ? CBase.Songs.GetNumSongsVisible() : CBase.Songs.GetNumCategories(); int curElements = CBase.Songs.IsInCategory() ? CBase.Songs.GetNumSongsVisible() : CBase.Songs.GetNumCategories();