Merge branch 'develop' into Better_Graphics_Handling
Conflicts: VocaluxeLib/Menu/CNameSelection.cs VocaluxeLib/Menu/CPlaylist.cs VocaluxeLib/Menu/CText.cs VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs VocaluxeLib/Structs.cs VocaluxeLib/VocaluxeLib.csproj VocaluxeLib/Xml/CXMLReader.cs
This commit is contained in:
commit
355d7b4b5f
52 files changed
+1407
-653
No files matched your search
+13
-11
@@ -173,17 +173,11 @@ namespace Vocaluxe
|
||||
|
||||
Application.DoEvents();
|
||||
|
||||
// Init Font
|
||||
CLog.StartBenchmark("Init Font");
|
||||
CFonts.Init();
|
||||
CLog.StopBenchmark("Init Font");
|
||||
|
||||
Application.DoEvents();
|
||||
|
||||
// Load Cover
|
||||
CLog.StartBenchmark("Init Cover");
|
||||
CCover.Init();
|
||||
CLog.StopBenchmark("Init Cover");
|
||||
// Init Fonts
|
||||
CLog.StartBenchmark("Init Fonts");
|
||||
if (!CFonts.Init())
|
||||
throw new CLoadingException("fonts");
|
||||
CLog.StopBenchmark("Init Fonts");
|
||||
|
||||
Application.DoEvents();
|
||||
|
||||
@@ -195,6 +189,13 @@ namespace Vocaluxe
|
||||
|
||||
Application.DoEvents();
|
||||
|
||||
// Load Cover
|
||||
CLog.StartBenchmark("Init Cover");
|
||||
CCover.Init();
|
||||
CLog.StopBenchmark("Init Cover");
|
||||
|
||||
Application.DoEvents();
|
||||
|
||||
// Init Screens
|
||||
CLog.StartBenchmark("Init Screens");
|
||||
CGraphics.Init();
|
||||
@@ -265,6 +266,7 @@ namespace Vocaluxe
|
||||
CGraphics.Close();
|
||||
CTheme.Close();
|
||||
CCover.Close();
|
||||
CFonts.Close();
|
||||
CBackgroundMusic.Close();
|
||||
CWebcam.Close();
|
||||
CDataBase.Close();
|
||||
|
||||
Reference in new issue
Block a user