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

Remove PreviewId pending stuff (don't need that. If you need a fade or something implement it properly with timer, event... But PreviewId should really be the current preview element)

Browse Source
This commit is contained in:
Flamefire committed 2013-10-18 23:58:15 +02:00
1 parent 60bd2c4da4
commit 03d92a474c
2 files changed
+1 -67
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs
+1 -61
View File
@@ -100,7 +100,6 @@ namespace VocaluxeLib.Menu.SongMenu
protected SThemeSongMenu _Theme;
private bool _ThemeLoaded;
private readonly Stopwatch _Timer = new Stopwatch();
private readonly Stopwatch _VideoFadeTimer = new Stopwatch();
private readonly List<int> _Streams = new List<int>();
private int _Actsong = -1;
@@ -114,62 +113,11 @@ namespace VocaluxeLib.Menu.SongMenu
protected SRectF _Rect;
protected SColorF _Color;
private int _PreviewIdInternal = -1;
private int _PreviewIdPending = -1;
protected long _PendingTime = 500L;
protected bool _Active;
protected float _MaxVolume = 100f;
protected int _PreviewId
{
//for preview only
get
{
if ((_PreviewIdInternal != _PreviewIdPending) && (_Timer.ElapsedMilliseconds >= _PendingTime))
{
_Timer.Reset();
_PreviewIdInternal = _PreviewIdPending;
}
return _PreviewIdInternal;
}
set
{
if (value == -1)
{
_Timer.Reset();
_PreviewIdInternal = -1;
_PreviewIdPending = -1;
return;
}
if (value == _PreviewIdPending)
{
if (_Timer.ElapsedMilliseconds >= _PendingTime || _PreviewIdInternal == -1)
{
_Timer.Reset();
_PreviewIdInternal = _PreviewIdPending;
}
}
else
{
if (value != _PreviewIdInternal)
{
_Timer.Reset();
_Timer.Start();
}
_PreviewIdPending = value;
}
}
}
protected void _SetSelectedNow()
{
_Timer.Reset();
_PreviewIdInternal = _PreviewIdPending;
}
protected int _PreviewId { get; set; }
private int _LockedInternal = -1;
protected int _Locked
@@ -481,10 +429,6 @@ namespace VocaluxeLib.Menu.SongMenu
_Video = -1;
CBase.Drawing.RemoveTexture(ref _Vidtex);
_Timer.Stop();
_Timer.Reset();
_PreviewIdInternal = _PreviewIdPending;
}
public virtual void HandleInput(ref SKeyEvent keyEvent, SScreenSongOptions songOptions) {}
@@ -662,10 +606,6 @@ namespace VocaluxeLib.Menu.SongMenu
_Video = -1;
CBase.Drawing.RemoveTexture(ref _Vidtex);
_Timer.Stop();
_Timer.Reset();
_PreviewIdInternal = _PreviewIdPending;
}
#region ThemeEdit