Removed duplicated log entries

This commit is contained in:
lukeIam committed 2018-01-19 21:10:23 +01:00
1 parent 92a6bcee49
commit 611a5b35e7
5 files changed
+8 -39

No files matched your search

-3
View File
@@ -63,7 +63,6 @@ namespace Vocaluxe.Base
public static void Init() public static void Init()
{ {
// Add Screens, must be the same order as in EScreens! // Add Screens, must be the same order as in EScreens!
CLog.Information("Build Screen List");
using (CBenchmark.Time("Build Screen List")) using (CBenchmark.Time("Build Screen List"))
{ {
_Screens.Add(new CScreenTest()); _Screens.Add(new CScreenTest());
@@ -100,7 +99,6 @@ namespace Vocaluxe.Base
GlobalAlpha = 1f; GlobalAlpha = 1f;
ZOffset = 0f; ZOffset = 0f;
CLog.Information("Load Theme");
using (CBenchmark.Time("Load Theme")) using (CBenchmark.Time("Load Theme"))
{ {
LoadTheme(); LoadTheme();
@@ -121,7 +119,6 @@ namespace Vocaluxe.Base
for (int i = 0; i < _Screens.Count; i++) for (int i = 0; i < _Screens.Count; i++)
{ {
CLog.Information("Load Theme " + Enum.GetNames(typeof(EScreen))[i]);
using (CBenchmark.Time("Load Theme " + Enum.GetNames(typeof(EScreen))[i])) using (CBenchmark.Time("Load Theme " + Enum.GetNames(typeof(EScreen))[i]))
{ {
_Screens[i].Init(); _Screens[i].Init();
+2 -7
View File
@@ -334,15 +334,13 @@ namespace Vocaluxe.Base
public static void LoadSongs() public static void LoadSongs()
{ {
CLog.Information("Load Songs");
using (CBenchmark.Time("Load Songs")) using (CBenchmark.Time("Load Songs"))
{ {
SongsLoaded = false; SongsLoaded = false;
_Songs.Clear(); _Songs.Clear();
var files = new List<string>(); var files = new List<string>();
CLog.Information("List Songs");
using (CBenchmark.Time("List Songs")) using (CBenchmark.Time("List Songs"))
{ {
@@ -357,7 +355,6 @@ namespace Vocaluxe.Base
} }
} }
CLog.Information("Read TXTs");
using (CBenchmark.Time("Read TXTs")) using (CBenchmark.Time("Read TXTs"))
{ {
foreach (string file in files) foreach (string file in files)
@@ -370,8 +367,7 @@ namespace Vocaluxe.Base
_Songs.Add(song); _Songs.Add(song);
} }
} }
CLog.Information("Sort Songs");
using (CBenchmark.Time("Sorted Songs")) using (CBenchmark.Time("Sorted Songs"))
{ {
Sorter.SongSorting = CConfig.Config.Game.SongSorting; Sorter.SongSorting = CConfig.Config.Game.SongSorting;
@@ -408,7 +404,6 @@ namespace Vocaluxe.Base
private static void _LoadCovers() private static void _LoadCovers()
{ {
CLog.Information("Load Covers");
using (CBenchmark.Time("Loaded Covers")) using (CBenchmark.Time("Loaded Covers"))
{ {
int songCount = _Songs.Count; int songCount = _Songs.Count;
+1 -2
View File
@@ -288,8 +288,7 @@ namespace Vocaluxe.Base.Fonts
return false; return false;
} }
} }
CLog.Information("Build Glyphs");
using (CBenchmark.Time("Build Glyphs")) using (CBenchmark.Time("Build Glyphs"))
{ {
_BuildGlyphs(); _BuildGlyphs();
+4 -24
View File
@@ -103,15 +103,13 @@ namespace Vocaluxe
if (!CProgrammHelper.CheckRequirements()) if (!CProgrammHelper.CheckRequirements())
return; return;
CProgrammHelper.Init(); CProgrammHelper.Init();
CLog.Information("Init Program");
using (CBenchmark.Time("Init Program")) using (CBenchmark.Time("Init Program"))
{ {
CMain.Init(); CMain.Init();
Application.DoEvents(); Application.DoEvents();
// Init Language // Init Language
CLog.Information("Init Language");
using (CBenchmark.Time("Init Language")) using (CBenchmark.Time("Init Language"))
{ {
if (!CLanguage.Init()) if (!CLanguage.Init())
@@ -121,7 +119,6 @@ namespace Vocaluxe
Application.DoEvents(); Application.DoEvents();
// load config // load config
CLog.Information("Init Config");
using (CBenchmark.Time("Init Config")) using (CBenchmark.Time("Init Config"))
{ {
CConfig.LoadCommandLineParams(args); CConfig.LoadCommandLineParams(args);
@@ -137,7 +134,6 @@ namespace Vocaluxe
Application.DoEvents(); Application.DoEvents();
// Init Draw // Init Draw
CLog.Information("Init Draw");
using (CBenchmark.Time("Init Draw")) using (CBenchmark.Time("Init Draw"))
{ {
if (!CDraw.Init()) if (!CDraw.Init())
@@ -147,7 +143,6 @@ namespace Vocaluxe
Application.DoEvents(); Application.DoEvents();
// Init Playback // Init Playback
CLog.Information("Init Playback");
using (CBenchmark.Time("Init Playback")) using (CBenchmark.Time("Init Playback"))
{ {
if (!CSound.Init()) if (!CSound.Init())
@@ -157,7 +152,6 @@ namespace Vocaluxe
Application.DoEvents(); Application.DoEvents();
// Init Record // Init Record
CLog.Information("Init Record");
using (CBenchmark.Time("Init Record")) using (CBenchmark.Time("Init Record"))
{ {
if (!CRecord.Init()) if (!CRecord.Init())
@@ -167,7 +161,6 @@ namespace Vocaluxe
Application.DoEvents(); Application.DoEvents();
// Init VideoDecoder // Init VideoDecoder
CLog.Information("Init Videodecoder");
using (CBenchmark.Time("Init Videodecoder")) using (CBenchmark.Time("Init Videodecoder"))
{ {
if (!CVideo.Init()) if (!CVideo.Init())
@@ -177,7 +170,6 @@ namespace Vocaluxe
Application.DoEvents(); Application.DoEvents();
// Init Database // Init Database
CLog.Information("Init Database");
using (CBenchmark.Time("Init Database")) using (CBenchmark.Time("Init Database"))
{ {
if (!CDataBase.Init()) if (!CDataBase.Init())
@@ -187,7 +179,6 @@ namespace Vocaluxe
Application.DoEvents(); Application.DoEvents();
//Init Webcam //Init Webcam
CLog.Information("Init Webcam");
using (CBenchmark.Time("Init Webcam")) using (CBenchmark.Time("Init Webcam"))
{ {
if (!CWebcam.Init()) if (!CWebcam.Init())
@@ -197,7 +188,6 @@ namespace Vocaluxe
Application.DoEvents(); Application.DoEvents();
// Init Background Music // Init Background Music
CLog.Information("Init Background Music");
using (CBenchmark.Time("Init Background Music")) using (CBenchmark.Time("Init Background Music"))
{ {
CBackgroundMusic.Init(); CBackgroundMusic.Init();
@@ -206,7 +196,6 @@ namespace Vocaluxe
Application.DoEvents(); Application.DoEvents();
// Init Profiles // Init Profiles
CLog.Information("Init Profiles");
using (CBenchmark.Time("Init Profiles")) using (CBenchmark.Time("Init Profiles"))
{ {
CProfiles.Init(); CProfiles.Init();
@@ -215,7 +204,6 @@ namespace Vocaluxe
Application.DoEvents(); Application.DoEvents();
// Init Fonts // Init Fonts
CLog.Information("Init Fonts");
using (CBenchmark.Time("Init Fonts")) using (CBenchmark.Time("Init Fonts"))
{ {
if (!CFonts.Init()) if (!CFonts.Init())
@@ -225,14 +213,12 @@ namespace Vocaluxe
Application.DoEvents(); Application.DoEvents();
// Theme System // Theme System
CLog.Information("Init Theme");
using (CBenchmark.Time("Init Theme")) using (CBenchmark.Time("Init Theme"))
{ {
if (!CThemes.Init()) if (!CThemes.Init())
throw new CLoadingException("theme"); throw new CLoadingException("theme");
} }
CLog.Information("Load Theme");
using (CBenchmark.Time("Load Theme")) using (CBenchmark.Time("Load Theme"))
{ {
CThemes.Load(); CThemes.Load();
@@ -241,7 +227,6 @@ namespace Vocaluxe
Application.DoEvents(); Application.DoEvents();
// Load Cover // Load Cover
CLog.Information("Init Cover");
using (CBenchmark.Time("Init Cover")) using (CBenchmark.Time("Init Cover"))
{ {
if (!CCover.Init()) if (!CCover.Init())
@@ -251,7 +236,6 @@ namespace Vocaluxe
Application.DoEvents(); Application.DoEvents();
// Init Screens // Init Screens
CLog.Information("Init Screens");
using (CBenchmark.Time("Init Screens")) using (CBenchmark.Time("Init Screens"))
{ {
CGraphics.Init(); CGraphics.Init();
@@ -260,7 +244,6 @@ namespace Vocaluxe
Application.DoEvents(); Application.DoEvents();
// Init Server // Init Server
CLog.Information("Init Server");
using (CBenchmark.Time("Init Server")) using (CBenchmark.Time("Init Server"))
{ {
CVocaluxeServer.Init(); CVocaluxeServer.Init();
@@ -269,7 +252,6 @@ namespace Vocaluxe
Application.DoEvents(); Application.DoEvents();
// Init Input // Init Input
CLog.Information("Init Input");
using (CBenchmark.Time("Init Input")) using (CBenchmark.Time("Init Input"))
{ {
CController.Init(); CController.Init();
@@ -278,8 +260,7 @@ namespace Vocaluxe
Application.DoEvents(); Application.DoEvents();
// Init Game; // Init Game
CLog.Information("Init Game");
using (CBenchmark.Time("Init Game")) using (CBenchmark.Time("Init Game"))
{ {
CGame.Init(); CGame.Init();
@@ -289,8 +270,7 @@ namespace Vocaluxe
Application.DoEvents(); Application.DoEvents();
// Init Party Modes; // Init Party Modes
CLog.Information("Init Party Modes");
using (CBenchmark.Time("Init Party Modes")) using (CBenchmark.Time("Init Party Modes"))
{ {
if (!CParty.Init()) if (!CParty.Init())
+1 -3
View File
@@ -126,8 +126,7 @@ namespace Vocaluxe.Screens
foreach (CVideoPlayer videoPlayer in _Intros) foreach (CVideoPlayer videoPlayer in _Intros)
videoPlayer.PreLoad(); videoPlayer.PreLoad();
} }
CLog.Information("Load Songs Full");
_TimerLoadSongsFull = CBenchmark.Time("Loaded Songs Full"); _TimerLoadSongsFull = CBenchmark.Time("Loaded Songs Full");
_SongLoaderThread = new Thread(CSongs.LoadSongs) {Name = "SongLoader", IsBackground = true}; _SongLoaderThread = new Thread(CSongs.LoadSongs) {Name = "SongLoader", IsBackground = true};
@@ -186,7 +185,6 @@ namespace Vocaluxe.Screens
_TimerLoadSongsFull.Dispose(); _TimerLoadSongsFull.Dispose();
//Init Playlists //Init Playlists
CLog.Information("Init Playlists");
using (CBenchmark.Time("Init Playlists")) using (CBenchmark.Time("Init Playlists"))
{ {
CPlaylists.Init(); CPlaylists.Init();