returned to threaded cover loading: there are no threading problems and its a lot faster!
This commit is contained in:
1 parent
0cf658bce9
commit
b024e9b958
2 files changed
+16
-10
No files matched your search
@@ -311,7 +311,7 @@ namespace Vocaluxe.Base
|
|||||||
CInput.Update();
|
CInput.Update();
|
||||||
|
|
||||||
if (CConfig.CoverLoading == ECoverLoading.TR_CONFIG_COVERLOADING_DYNAMIC && _CurrentScreen != EScreens.ScreenSing)
|
if (CConfig.CoverLoading == ECoverLoading.TR_CONFIG_COVERLOADING_DYNAMIC && _CurrentScreen != EScreens.ScreenSing)
|
||||||
CSongs.LoadCover(30, 1);
|
CSongs.LoadCover();
|
||||||
|
|
||||||
if (CSettings.GameState != EGameState.EditTheme)
|
if (CSettings.GameState != EGameState.EditTheme)
|
||||||
{
|
{
|
||||||
|
|||||||
+15
-9
@@ -1,6 +1,8 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Diagnostics;
|
using System.Diagnostics;
|
||||||
|
using System.Threading;
|
||||||
|
|
||||||
using VocaluxeLib.Menu;
|
using VocaluxeLib.Menu;
|
||||||
using VocaluxeLib.Menu.SongMenu;
|
using VocaluxeLib.Menu.SongMenu;
|
||||||
|
|
||||||
@@ -42,6 +44,8 @@ namespace Vocaluxe.Base
|
|||||||
public static CSongSorter Sorter = new CSongSorter();
|
public static CSongSorter Sorter = new CSongSorter();
|
||||||
public static CSongCategorizer Categorizer = new CSongCategorizer();
|
public static CSongCategorizer Categorizer = new CSongCategorizer();
|
||||||
|
|
||||||
|
private static Thread _CoverLoaderThread = null;
|
||||||
|
|
||||||
public static List<CSong> Songs
|
public static List<CSong> Songs
|
||||||
{
|
{
|
||||||
get { return _Songs; }
|
get { return _Songs; }
|
||||||
@@ -391,8 +395,6 @@ namespace Vocaluxe.Base
|
|||||||
{
|
{
|
||||||
Song.ID = _Songs.Count;
|
Song.ID = _Songs.Count;
|
||||||
_Songs.Add(Song);
|
_Songs.Add(Song);
|
||||||
//Workaround to load notes if they are not loaded with the covers as there is no seperate progress indicator
|
|
||||||
if (CConfig.CoverLoading != ECoverLoading.TR_CONFIG_COVERLOADING_ATSTART)
|
|
||||||
Song.ReadNotes();
|
Song.ReadNotes();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -410,14 +412,14 @@ namespace Vocaluxe.Base
|
|||||||
if (CConfig.CoverLoading == ECoverLoading.TR_CONFIG_COVERLOADING_ATSTART)
|
if (CConfig.CoverLoading == ECoverLoading.TR_CONFIG_COVERLOADING_ATSTART)
|
||||||
{
|
{
|
||||||
CLog.StartBenchmark(2, "Load Covers/Notes");
|
CLog.StartBenchmark(2, "Load Covers/Notes");
|
||||||
_LoadCoverAndNotes();
|
_LoadCover();
|
||||||
CLog.StopBenchmark(2, "Load Covers/Notes");
|
CLog.StopBenchmark(2, "Load Covers/Notes");
|
||||||
}
|
}
|
||||||
CLog.StopBenchmark(1, "Load Songs ");
|
CLog.StopBenchmark(1, "Load Songs ");
|
||||||
GC.Collect();
|
GC.Collect();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void LoadCover(int WaitTime, int NumLoads)
|
public static void LoadCover()
|
||||||
{
|
{
|
||||||
if (CConfig.Renderer == ERenderer.TR_CONFIG_SOFTWARE)
|
if (CConfig.Renderer == ERenderer.TR_CONFIG_SOFTWARE)
|
||||||
return; //should be removed as soon as the other renderer are ready for queque
|
return; //should be removed as soon as the other renderer are ready for queque
|
||||||
@@ -425,12 +427,16 @@ namespace Vocaluxe.Base
|
|||||||
if (!SongsLoaded || CoverLoaded)
|
if (!SongsLoaded || CoverLoaded)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (!_CoverLoadTimer.IsRunning)
|
if (_CoverLoaderThread == null)
|
||||||
{
|
{
|
||||||
_CoverLoadTimer.Reset();
|
_CoverLoaderThread = new Thread(new ThreadStart(_LoadCover));
|
||||||
_CoverLoadTimer.Start();
|
_CoverLoaderThread.Name = "CoverLoader";
|
||||||
|
_CoverLoaderThread.Priority = ThreadPriority.BelowNormal;
|
||||||
|
_CoverLoaderThread.IsBackground = true;
|
||||||
|
_CoverLoaderThread.Start();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
if (_CoverLoadTimer.ElapsedMilliseconds >= WaitTime)
|
if (_CoverLoadTimer.ElapsedMilliseconds >= WaitTime)
|
||||||
{
|
{
|
||||||
for (int i = 0; i < NumLoads; i++)
|
for (int i = 0; i < NumLoads; i++)
|
||||||
@@ -449,13 +455,13 @@ namespace Vocaluxe.Base
|
|||||||
_CoverLoadTimer.Reset();
|
_CoverLoadTimer.Reset();
|
||||||
_CoverLoadTimer.Start();
|
_CoverLoadTimer.Start();
|
||||||
}
|
}
|
||||||
|
* */
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void _LoadCoverAndNotes()
|
private static void _LoadCover()
|
||||||
{
|
{
|
||||||
foreach (CSong song in _Songs)
|
foreach (CSong song in _Songs)
|
||||||
{
|
{
|
||||||
song.ReadNotes();
|
|
||||||
song.LoadSmallCover();
|
song.LoadSmallCover();
|
||||||
_CoverLoadIndex++;
|
_CoverLoadIndex++;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in new issue
Block a user