diff --git a/Vocaluxe/Base/CConfig.cs b/Vocaluxe/Base/CConfig.cs index fc2cea6f..6751d1fb 100644 --- a/Vocaluxe/Base/CConfig.cs +++ b/Vocaluxe/Base/CConfig.cs @@ -122,11 +122,11 @@ namespace Vocaluxe.Base public static bool LoadConfig() { #region Inits - CXMLReader xPathHelper; + CXMLReader xmlReader; try { - xPathHelper = new CXMLReader(CSettings.sFileConfig); + xmlReader = new CXMLReader(CSettings.sFileConfig); } catch (Exception e) { @@ -138,56 +138,56 @@ namespace Vocaluxe.Base string value = string.Empty; #region Debug - xPathHelper.TryGetEnumValue("//root/Debug/DebugLevel", ref DebugLevel); + xmlReader.TryGetEnumValue("//root/Debug/DebugLevel", ref DebugLevel); #endregion Debug #region Graphics - xPathHelper.TryGetEnumValue("//root/Graphics/Renderer", ref Renderer); - xPathHelper.TryGetEnumValue("//root/Graphics/TextureQuality", ref TextureQuality); - xPathHelper.TryGetIntValueRange("//root/Graphics/CoverSize", ref CoverSize, 32, 1024); + xmlReader.TryGetEnumValue("//root/Graphics/Renderer", ref Renderer); + xmlReader.TryGetEnumValue("//root/Graphics/TextureQuality", ref TextureQuality); + xmlReader.TryGetIntValueRange("//root/Graphics/CoverSize", ref CoverSize, 32, 1024); - xPathHelper.TryGetIntValue("//root/Graphics/ScreenW", ref ScreenW); - xPathHelper.TryGetIntValue("//root/Graphics/ScreenH", ref ScreenH); - xPathHelper.TryGetEnumValue("//root/Graphics/AAMode", ref AAMode); - xPathHelper.TryGetEnumValue("//root/Graphics/Colors", ref Colors); - xPathHelper.TryGetFloatValue("//root/Graphics/MaxFPS", ref MaxFPS); - xPathHelper.TryGetEnumValue("//root/Graphics/VSync", ref VSync); - xPathHelper.TryGetEnumValue("//root/Graphics/FullScreen", ref FullScreen); - xPathHelper.TryGetFloatValue("//root/Graphics/FadeTime", ref FadeTime); + xmlReader.TryGetIntValue("//root/Graphics/ScreenW", ref ScreenW); + xmlReader.TryGetIntValue("//root/Graphics/ScreenH", ref ScreenH); + xmlReader.TryGetEnumValue("//root/Graphics/AAMode", ref AAMode); + xmlReader.TryGetEnumValue("//root/Graphics/Colors", ref Colors); + xmlReader.TryGetFloatValue("//root/Graphics/MaxFPS", ref MaxFPS); + xmlReader.TryGetEnumValue("//root/Graphics/VSync", ref VSync); + xmlReader.TryGetEnumValue("//root/Graphics/FullScreen", ref FullScreen); + xmlReader.TryGetFloatValue("//root/Graphics/FadeTime", ref FadeTime); #endregion Graphics #region Theme - xPathHelper.GetValue("//root/Theme/Name", ref Theme, Theme); - xPathHelper.GetValue("//root/Theme/Skin", ref Skin, Skin); - xPathHelper.GetValue("//root/Theme/Cover", ref CoverTheme, CoverTheme); - xPathHelper.TryGetEnumValue("//root/Theme/DrawNoteLines", ref DrawNoteLines); - xPathHelper.TryGetEnumValue("//root/Theme/DrawToneHelper", ref DrawToneHelper); - xPathHelper.TryGetEnumValue("//root/Theme/TimerLook", ref TimerLook); - xPathHelper.TryGetEnumValue("//root/Theme/PlayerInfo", ref PlayerInfo); - xPathHelper.TryGetEnumValue("//root/Theme/FadePlayerInfo", ref FadePlayerInfo); - xPathHelper.TryGetEnumValue("//root/Theme/CoverLoading", ref CoverLoading); - xPathHelper.TryGetEnumValue("//root/Theme/LyricStyle", ref LyricStyle); + xmlReader.GetValue("//root/Theme/Name", ref Theme, Theme); + xmlReader.GetValue("//root/Theme/Skin", ref Skin, Skin); + xmlReader.GetValue("//root/Theme/Cover", ref CoverTheme, CoverTheme); + xmlReader.TryGetEnumValue("//root/Theme/DrawNoteLines", ref DrawNoteLines); + xmlReader.TryGetEnumValue("//root/Theme/DrawToneHelper", ref DrawToneHelper); + xmlReader.TryGetEnumValue("//root/Theme/TimerLook", ref TimerLook); + xmlReader.TryGetEnumValue("//root/Theme/PlayerInfo", ref PlayerInfo); + xmlReader.TryGetEnumValue("//root/Theme/FadePlayerInfo", ref FadePlayerInfo); + xmlReader.TryGetEnumValue("//root/Theme/CoverLoading", ref CoverLoading); + xmlReader.TryGetEnumValue("//root/Theme/LyricStyle", ref LyricStyle); #endregion Theme #region Sound - xPathHelper.TryGetEnumValue("//root/Sound/PlayBackLib", ref PlayBackLib); - xPathHelper.TryGetEnumValue("//root/Sound/RecordLib", ref RecordLib); - xPathHelper.TryGetEnumValue("//root/Sound/AudioBufferSize", ref AudioBufferSize); + xmlReader.TryGetEnumValue("//root/Sound/PlayBackLib", ref PlayBackLib); + xmlReader.TryGetEnumValue("//root/Sound/RecordLib", ref RecordLib); + xmlReader.TryGetEnumValue("//root/Sound/AudioBufferSize", ref AudioBufferSize); - xPathHelper.TryGetIntValueRange("//root/Sound/AudioLatency", ref AudioLatency, -500, 500); + xmlReader.TryGetIntValueRange("//root/Sound/AudioLatency", ref AudioLatency, -500, 500); - xPathHelper.TryGetEnumValue("//root/Sound/BackgroundMusic", ref BackgroundMusic); - xPathHelper.TryGetIntValueRange("//root/Sound/BackgroundMusicVolume", ref BackgroundMusicVolume); - xPathHelper.TryGetEnumValue("//root/Sound/BackgroundMusicSource", ref BackgroundMusicSource); - xPathHelper.TryGetIntValueRange("//root/Sound/PreviewMusicVolume", ref PreviewMusicVolume); - xPathHelper.TryGetIntValueRange("//root/Sound/GameMusicVolume", ref GameMusicVolume); + xmlReader.TryGetEnumValue("//root/Sound/BackgroundMusic", ref BackgroundMusic); + xmlReader.TryGetIntValueRange("//root/Sound/BackgroundMusicVolume", ref BackgroundMusicVolume); + xmlReader.TryGetEnumValue("//root/Sound/BackgroundMusicSource", ref BackgroundMusicSource); + xmlReader.TryGetIntValueRange("//root/Sound/PreviewMusicVolume", ref PreviewMusicVolume); + xmlReader.TryGetIntValueRange("//root/Sound/GameMusicVolume", ref GameMusicVolume); #endregion Sound #region Game // Songfolder value = string.Empty; int i = 1; - while (xPathHelper.GetValue("//root/Game/SongFolder" + i.ToString(), ref value, value)) + while (xmlReader.GetValue("//root/Game/SongFolder" + i.ToString(), ref value, value)) { if (i == 1) SongFolder.Clear(); @@ -197,15 +197,15 @@ namespace Vocaluxe.Base i++; } - xPathHelper.TryGetEnumValue("//root/Game/SongMenu", ref SongMenu); - xPathHelper.TryGetEnumValue("//root/Game/SongSorting", ref SongSorting); - xPathHelper.TryGetEnumValue("//root/Game/IgnoreArticles", ref IgnoreArticles); - xPathHelper.TryGetFloatValue("//root/Game/ScoreAnimationTime", ref ScoreAnimationTime); - xPathHelper.TryGetEnumValue("//root/Game/TimerMode", ref TimerMode); - xPathHelper.TryGetIntValue("//root/Game/NumPlayer", ref NumPlayer); - xPathHelper.TryGetEnumValue("//root/Game/Tabs", ref Tabs); - xPathHelper.GetValue("//root/Game/Language", ref Language, Language); - xPathHelper.TryGetEnumValue("//root/Game/LyricsOnTop", ref LyricsOnTop); + xmlReader.TryGetEnumValue("//root/Game/SongMenu", ref SongMenu); + xmlReader.TryGetEnumValue("//root/Game/SongSorting", ref SongSorting); + xmlReader.TryGetEnumValue("//root/Game/IgnoreArticles", ref IgnoreArticles); + xmlReader.TryGetFloatValue("//root/Game/ScoreAnimationTime", ref ScoreAnimationTime); + xmlReader.TryGetEnumValue("//root/Game/TimerMode", ref TimerMode); + xmlReader.TryGetIntValue("//root/Game/NumPlayer", ref NumPlayer); + xmlReader.TryGetEnumValue("//root/Game/Tabs", ref Tabs); + xmlReader.GetValue("//root/Game/Language", ref Language, Language); + xmlReader.TryGetEnumValue("//root/Game/LyricsOnTop", ref LyricsOnTop); if ((ScoreAnimationTime > 0 && ScoreAnimationTime < 1) || ScoreAnimationTime < 0) { @@ -238,24 +238,24 @@ namespace Vocaluxe.Base //Read players from config for (i = 1; i <= CSettings.MaxNumPlayer; i++) { - xPathHelper.GetValue("//root/Game/Players/Player" + i.ToString(), ref Players[i - 1], string.Empty); + xmlReader.GetValue("//root/Game/Players/Player" + i.ToString(), ref Players[i - 1], string.Empty); } #endregion Game #region Video - xPathHelper.TryGetEnumValue("//root/Video/VideoDecoder", ref VideoDecoder); - xPathHelper.TryGetEnumValue("//root/Video/VideoBackgrounds", ref VideoBackgrounds); - xPathHelper.TryGetEnumValue("//root/Video/VideoPreview", ref VideoPreview); - xPathHelper.TryGetEnumValue("//root/Video/VideosInSongs", ref VideosInSongs); - xPathHelper.TryGetEnumValue("//root/Video/VideosToBackground", ref VideosToBackground); + xmlReader.TryGetEnumValue("//root/Video/VideoDecoder", ref VideoDecoder); + xmlReader.TryGetEnumValue("//root/Video/VideoBackgrounds", ref VideoBackgrounds); + xmlReader.TryGetEnumValue("//root/Video/VideoPreview", ref VideoPreview); + xmlReader.TryGetEnumValue("//root/Video/VideosInSongs", ref VideosInSongs); + xmlReader.TryGetEnumValue("//root/Video/VideosToBackground", ref VideosToBackground); - xPathHelper.TryGetEnumValue("//root/Video/WebcamLib", ref WebcamLib); + xmlReader.TryGetEnumValue("//root/Video/WebcamLib", ref WebcamLib); WebcamConfig = new SWebcamConfig(); - xPathHelper.GetValue("//root/Video/WebcamConfig/MonikerString", ref WebcamConfig.MonikerString, String.Empty); - xPathHelper.TryGetIntValue("//root/Video/WebcamConfig/Framerate", ref WebcamConfig.Framerate); - xPathHelper.TryGetIntValue("//root/Video/WebcamConfig/Width", ref WebcamConfig.Width); - xPathHelper.TryGetIntValue("//root/Video/WebcamConfig/Height", ref WebcamConfig.Height); + xmlReader.GetValue("//root/Video/WebcamConfig/MonikerString", ref WebcamConfig.MonikerString, String.Empty); + xmlReader.TryGetIntValue("//root/Video/WebcamConfig/Framerate", ref WebcamConfig.Framerate); + xmlReader.TryGetIntValue("//root/Video/WebcamConfig/Width", ref WebcamConfig.Width); + xmlReader.TryGetIntValue("//root/Video/WebcamConfig/Height", ref WebcamConfig.Height); #endregion Video #region Record @@ -264,13 +264,13 @@ namespace Vocaluxe.Base for (int p = 1; p <= CSettings.MaxNumPlayer; p++) { MicConfig[p - 1] = new SMicConfig(0); - xPathHelper.GetValue("//root/Record/MicConfig" + p.ToString() + "/DeviceName", ref MicConfig[p - 1].DeviceName, String.Empty); - xPathHelper.GetValue("//root/Record/MicConfig" + p.ToString() + "/DeviceDriver", ref MicConfig[p - 1].DeviceDriver, String.Empty); - xPathHelper.GetValue("//root/Record/MicConfig" + p.ToString() + "/InputName", ref MicConfig[p - 1].InputName, String.Empty); - xPathHelper.TryGetIntValue("//root/Record/MicConfig" + p.ToString() + "/Channel", ref MicConfig[p - 1].Channel); + xmlReader.GetValue("//root/Record/MicConfig" + p.ToString() + "/DeviceName", ref MicConfig[p - 1].DeviceName, String.Empty); + xmlReader.GetValue("//root/Record/MicConfig" + p.ToString() + "/DeviceDriver", ref MicConfig[p - 1].DeviceDriver, String.Empty); + xmlReader.GetValue("//root/Record/MicConfig" + p.ToString() + "/InputName", ref MicConfig[p - 1].InputName, String.Empty); + xmlReader.TryGetIntValue("//root/Record/MicConfig" + p.ToString() + "/Channel", ref MicConfig[p - 1].Channel); } - xPathHelper.TryGetIntValueRange("//root/Record/MicDelay", ref MicDelay, 0, 500); + xmlReader.TryGetIntValueRange("//root/Record/MicDelay", ref MicDelay, 0, 500); MicDelay = (int)(20 * Math.Round(MicDelay / 20.0)); #endregion Record diff --git a/Vocaluxe/Base/CCover.cs b/Vocaluxe/Base/CCover.cs index bfff1c83..66b8f8c5 100644 --- a/Vocaluxe/Base/CCover.cs +++ b/Vocaluxe/Base/CCover.cs @@ -163,14 +163,14 @@ namespace Vocaluxe.Base foreach (string file in files) { - CXMLReader xPathHelper = CXMLReader.OpenFile(Path.Combine(path, file)); + CXMLReader xmlReader = CXMLReader.OpenFile(Path.Combine(path, file)); - if (xPathHelper != null) + if (xmlReader != null) { SCoverTheme coverTheme = new SCoverTheme(); - xPathHelper.GetValue("//root/Info/Name", ref coverTheme.Name, String.Empty); - xPathHelper.GetValue("//root/Info/Folder", ref coverTheme.Folder, String.Empty); + xmlReader.GetValue("//root/Info/Name", ref coverTheme.Name, String.Empty); + xmlReader.GetValue("//root/Info/Folder", ref coverTheme.Folder, String.Empty); if (coverTheme.Folder != String.Empty && coverTheme.Name != String.Empty) { @@ -194,21 +194,21 @@ namespace Vocaluxe.Base if (coverTheme.Name != String.Empty) { - CXMLReader xPathHelper = CXMLReader.OpenFile(Path.Combine(CSettings.sFolderCover, coverTheme.File)); + CXMLReader xmlReader = CXMLReader.OpenFile(Path.Combine(CSettings.sFolderCover, coverTheme.File)); - if (xPathHelper != null) + if (xmlReader != null) { lock (_MutexCover) { _Cover.Clear(); - List cover = xPathHelper.GetValues("Cover"); + List cover = xmlReader.GetValues("Cover"); for (int i = 0; i < cover.Count; i++) { SCover sk = new SCover(); string name = String.Empty; string value = String.Empty; - xPathHelper.GetValue("//root/Cover/" + cover[i] + "/Name", ref name, String.Empty); - xPathHelper.GetValue("//root/Cover/" + cover[i] + "/Path", ref value, String.Empty); + xmlReader.GetValue("//root/Cover/" + cover[i] + "/Name", ref name, String.Empty); + xmlReader.GetValue("//root/Cover/" + cover[i] + "/Path", ref value, String.Empty); sk.Name = name; sk.Value = Path.Combine(coverTheme.Folder,value); if (File.Exists(Path.Combine(CSettings.sFolderCover, Path.Combine(coverTheme.Folder, value)))) diff --git a/Vocaluxe/Base/CFont.cs b/Vocaluxe/Base/CFont.cs index 584dfec3..dbdc14f9 100644 --- a/Vocaluxe/Base/CFont.cs +++ b/Vocaluxe/Base/CFont.cs @@ -673,11 +673,11 @@ namespace Vocaluxe.Base /// private static bool LoadFontList() { - CXMLReader xPathHelper; + CXMLReader xmlReader; try { - xPathHelper = new CXMLReader(System.IO.Path.Combine(CSettings.sFolderFonts, CSettings.sFileFonts)); + xmlReader = new CXMLReader(System.IO.Path.Combine(CSettings.sFolderFonts, CSettings.sFileFonts)); } catch (Exception e) { @@ -688,11 +688,11 @@ namespace Vocaluxe.Base string value = string.Empty; int i = 1; - while (xPathHelper.GetValue("//root/Font" + i.ToString() + "/Folder", ref value, value)) + while (xmlReader.GetValue("//root/Font" + i.ToString() + "/Folder", ref value, value)) { string Folder = value; - xPathHelper.GetValue("//root/Font" + i.ToString() + "/FileNormal", ref value, value); + xmlReader.GetValue("//root/Font" + i.ToString() + "/FileNormal", ref value, value); value = Path.Combine(Directory.GetCurrentDirectory(), Path.Combine(CSettings.sFolderFonts, Path.Combine(Folder, value))); CFont f = new CFont(value); @@ -700,38 +700,38 @@ namespace Vocaluxe.Base sf.Normal = f; string name = String.Empty; - xPathHelper.GetValue("//root/Font" + i.ToString() + "/Name", ref name, value); + xmlReader.GetValue("//root/Font" + i.ToString() + "/Name", ref name, value); sf.Name = name; sf.IsThemeFont = false; sf.ThemeName = String.Empty; sf.PartyModeID = -1; - xPathHelper.GetValue("//root/Font" + i.ToString() + "/FileItalic", ref value, value); + xmlReader.GetValue("//root/Font" + i.ToString() + "/FileItalic", ref value, value); value = Path.Combine(Directory.GetCurrentDirectory(), Path.Combine(CSettings.sFolderFonts, Path.Combine(Folder, value))); f = new CFont(value); sf.Italic = f; - xPathHelper.GetValue("//root/Font" + i.ToString() + "/FileBold", ref value, value); + xmlReader.GetValue("//root/Font" + i.ToString() + "/FileBold", ref value, value); value = Path.Combine(Directory.GetCurrentDirectory(), Path.Combine(CSettings.sFolderFonts, Path.Combine(Folder, value))); f = new CFont(value); sf.Bold = f; - xPathHelper.GetValue("//root/Font" + i.ToString() + "/FileBoldItalic", ref value, value); + xmlReader.GetValue("//root/Font" + i.ToString() + "/FileBoldItalic", ref value, value); value = Path.Combine(Directory.GetCurrentDirectory(), Path.Combine(CSettings.sFolderFonts, Path.Combine(Folder, value))); f = new CFont(value); sf.BoldItalic = f; sf.Outline = 0f; - xPathHelper.TryGetFloatValue("//root/Font" + i.ToString() + "/Outline", ref sf.Outline); + xmlReader.TryGetFloatValue("//root/Font" + i.ToString() + "/Outline", ref sf.Outline); sf.OutlineColor = new SColorF(0f, 0f, 0f, 1f); - xPathHelper.TryGetFloatValue("//root/Font" + i.ToString() + "/OutlineColorR", ref sf.OutlineColor.R); - xPathHelper.TryGetFloatValue("//root/Font" + i.ToString() + "/OutlineColorG", ref sf.OutlineColor.G); - xPathHelper.TryGetFloatValue("//root/Font" + i.ToString() + "/OutlineColorB", ref sf.OutlineColor.B); - xPathHelper.TryGetFloatValue("//root/Font" + i.ToString() + "/OutlineColorA", ref sf.OutlineColor.A); + xmlReader.TryGetFloatValue("//root/Font" + i.ToString() + "/OutlineColorR", ref sf.OutlineColor.R); + xmlReader.TryGetFloatValue("//root/Font" + i.ToString() + "/OutlineColorG", ref sf.OutlineColor.G); + xmlReader.TryGetFloatValue("//root/Font" + i.ToString() + "/OutlineColorB", ref sf.OutlineColor.B); + xmlReader.TryGetFloatValue("//root/Font" + i.ToString() + "/OutlineColorA", ref sf.OutlineColor.A); _Fonts.Add(sf); i++; @@ -742,11 +742,11 @@ namespace Vocaluxe.Base /// /// Loads theme fonts from skin file /// - public static void LoadThemeFonts(string ThemeName, string FontFolder, CXMLReader xPathHelper) + public static void LoadThemeFonts(string ThemeName, string FontFolder, CXMLReader xmlReader) { string value = string.Empty; int i = 1; - while (xPathHelper.GetValue("//root/Fonts/Font" + i.ToString() + "/Folder", ref value, value)) + while (xmlReader.GetValue("//root/Fonts/Font" + i.ToString() + "/Folder", ref value, value)) { SFont sf = new SFont(); sf.Folder = value; @@ -757,42 +757,42 @@ namespace Vocaluxe.Base bool ok = true; - ok &= xPathHelper.GetValue("//root/Fonts/Font" + i.ToString() + "/FileNormal", ref value, value); + ok &= xmlReader.GetValue("//root/Fonts/Font" + i.ToString() + "/FileNormal", ref value, value); sf.FileNormal = value; value = Path.Combine(FontFolder, Path.Combine(sf.Folder, value)); CFont f = new CFont(value); sf.Normal = f; string name = String.Empty; - ok &= xPathHelper.GetValue("//root/Fonts/Font" + i.ToString() + "/Name", ref name, value); + ok &= xmlReader.GetValue("//root/Fonts/Font" + i.ToString() + "/Name", ref name, value); sf.Name = name; - ok &= xPathHelper.GetValue("//root/Fonts/Font" + i.ToString() + "/FileItalic", ref value, value); + ok &= xmlReader.GetValue("//root/Fonts/Font" + i.ToString() + "/FileItalic", ref value, value); sf.FileItalic = value; value = Path.Combine(FontFolder, Path.Combine(sf.Folder, value)); f = new CFont(value); sf.Italic = f; - ok &= xPathHelper.GetValue("//root/Fonts/Font" + i.ToString() + "/FileBold", ref value, value); + ok &= xmlReader.GetValue("//root/Fonts/Font" + i.ToString() + "/FileBold", ref value, value); sf.FileBold = value; value = Path.Combine(FontFolder, Path.Combine(sf.Folder, value)); f = new CFont(value); sf.Bold = f; - ok &= xPathHelper.GetValue("//root/Fonts/Font" + i.ToString() + "/FileBoldItalic", ref value, value); + ok &= xmlReader.GetValue("//root/Fonts/Font" + i.ToString() + "/FileBoldItalic", ref value, value); sf.FileBoldItalic = value; value = Path.Combine(FontFolder, Path.Combine(sf.Folder, value)); f = new CFont(value); sf.BoldItalic = f; sf.Outline = 0f; - ok &= xPathHelper.TryGetFloatValue("//root/Fonts/Font" + i.ToString() + "/Outline", ref sf.Outline); + ok &= xmlReader.TryGetFloatValue("//root/Fonts/Font" + i.ToString() + "/Outline", ref sf.Outline); sf.OutlineColor = new SColorF(0f, 0f, 0f, 1f); - ok &= xPathHelper.TryGetFloatValue("//root/Fonts/Font" + i.ToString() + "/OutlineColorR", ref sf.OutlineColor.R); - ok &= xPathHelper.TryGetFloatValue("//root/Fonts/Font" + i.ToString() + "/OutlineColorG", ref sf.OutlineColor.G); - ok &= xPathHelper.TryGetFloatValue("//root/Fonts/Font" + i.ToString() + "/OutlineColorB", ref sf.OutlineColor.B); - ok &= xPathHelper.TryGetFloatValue("//root/Fonts/Font" + i.ToString() + "/OutlineColorA", ref sf.OutlineColor.A); + ok &= xmlReader.TryGetFloatValue("//root/Fonts/Font" + i.ToString() + "/OutlineColorR", ref sf.OutlineColor.R); + ok &= xmlReader.TryGetFloatValue("//root/Fonts/Font" + i.ToString() + "/OutlineColorG", ref sf.OutlineColor.G); + ok &= xmlReader.TryGetFloatValue("//root/Fonts/Font" + i.ToString() + "/OutlineColorB", ref sf.OutlineColor.B); + ok &= xmlReader.TryGetFloatValue("//root/Fonts/Font" + i.ToString() + "/OutlineColorA", ref sf.OutlineColor.A); if (ok) _Fonts.Add(sf); @@ -877,11 +877,11 @@ namespace Vocaluxe.Base /// /// Loads party mode fonts from skin file /// - public static void LoadPartyModeFonts(int PartyModeID, string FontFolder, CXMLReader xPathHelper) + public static void LoadPartyModeFonts(int PartyModeID, string FontFolder, CXMLReader xmlReader) { string value = string.Empty; int i = 1; - while (xPathHelper.GetValue("//root/Fonts/Font" + i.ToString() + "/Folder", ref value, value)) + while (xmlReader.GetValue("//root/Fonts/Font" + i.ToString() + "/Folder", ref value, value)) { SFont sf = new SFont(); sf.Folder = value; @@ -892,42 +892,42 @@ namespace Vocaluxe.Base bool ok = true; - ok &= xPathHelper.GetValue("//root/Fonts/Font" + i.ToString() + "/FileNormal", ref value, value); + ok &= xmlReader.GetValue("//root/Fonts/Font" + i.ToString() + "/FileNormal", ref value, value); sf.FileNormal = value; value = Path.Combine(FontFolder, Path.Combine(sf.Folder, value)); CFont f = new CFont(value); sf.Normal = f; string name = String.Empty; - ok &= xPathHelper.GetValue("//root/Fonts/Font" + i.ToString() + "/Name", ref name, value); + ok &= xmlReader.GetValue("//root/Fonts/Font" + i.ToString() + "/Name", ref name, value); sf.Name = name; - ok &= xPathHelper.GetValue("//root/Fonts/Font" + i.ToString() + "/FileItalic", ref value, value); + ok &= xmlReader.GetValue("//root/Fonts/Font" + i.ToString() + "/FileItalic", ref value, value); sf.FileItalic = value; value = Path.Combine(FontFolder, Path.Combine(sf.Folder, value)); f = new CFont(value); sf.Italic = f; - ok &= xPathHelper.GetValue("//root/Fonts/Font" + i.ToString() + "/FileBold", ref value, value); + ok &= xmlReader.GetValue("//root/Fonts/Font" + i.ToString() + "/FileBold", ref value, value); sf.FileBold = value; value = Path.Combine(FontFolder, Path.Combine(sf.Folder, value)); f = new CFont(value); sf.Bold = f; - ok &= xPathHelper.GetValue("//root/Fonts/Font" + i.ToString() + "/FileBoldItalic", ref value, value); + ok &= xmlReader.GetValue("//root/Fonts/Font" + i.ToString() + "/FileBoldItalic", ref value, value); sf.FileBoldItalic = value; value = Path.Combine(FontFolder, Path.Combine(sf.Folder, value)); f = new CFont(value); sf.BoldItalic = f; sf.Outline = 0f; - ok &= xPathHelper.TryGetFloatValue("//root/Fonts/Font" + i.ToString() + "/Outline", ref sf.Outline); + ok &= xmlReader.TryGetFloatValue("//root/Fonts/Font" + i.ToString() + "/Outline", ref sf.Outline); sf.OutlineColor = new SColorF(0f, 0f, 0f, 1f); - ok &= xPathHelper.TryGetFloatValue("//root/Fonts/Font" + i.ToString() + "/OutlineColorR", ref sf.OutlineColor.R); - ok &= xPathHelper.TryGetFloatValue("//root/Fonts/Font" + i.ToString() + "/OutlineColorG", ref sf.OutlineColor.G); - ok &= xPathHelper.TryGetFloatValue("//root/Fonts/Font" + i.ToString() + "/OutlineColorB", ref sf.OutlineColor.B); - ok &= xPathHelper.TryGetFloatValue("//root/Fonts/Font" + i.ToString() + "/OutlineColorA", ref sf.OutlineColor.A); + ok &= xmlReader.TryGetFloatValue("//root/Fonts/Font" + i.ToString() + "/OutlineColorR", ref sf.OutlineColor.R); + ok &= xmlReader.TryGetFloatValue("//root/Fonts/Font" + i.ToString() + "/OutlineColorG", ref sf.OutlineColor.G); + ok &= xmlReader.TryGetFloatValue("//root/Fonts/Font" + i.ToString() + "/OutlineColorB", ref sf.OutlineColor.B); + ok &= xmlReader.TryGetFloatValue("//root/Fonts/Font" + i.ToString() + "/OutlineColorA", ref sf.OutlineColor.A); if (ok) _Fonts.Add(sf); diff --git a/Vocaluxe/Base/CLanguage.cs b/Vocaluxe/Base/CLanguage.cs index 9e23d605..bc366e11 100644 --- a/Vocaluxe/Base/CLanguage.cs +++ b/Vocaluxe/Base/CLanguage.cs @@ -240,11 +240,11 @@ namespace Vocaluxe.Base private static bool LoadPartyLanguageFile(int PartyModeID, string file) { - CXMLReader xPathHelper; + CXMLReader xmlReader; try { - xPathHelper = new CXMLReader(file); + xmlReader = new CXMLReader(file); } catch (Exception e) { @@ -253,7 +253,7 @@ namespace Vocaluxe.Base } string value = string.Empty; - if (xPathHelper.GetValue("//resources/string[@name='language']", ref value, value)) + if (xmlReader.GetValue("//resources/string[@name='language']", ref value, value)) { int nr = GetLanguageNr(value); @@ -264,10 +264,10 @@ namespace Vocaluxe.Base lang.PartyModeID = PartyModeID; lang.Texts = new Hashtable(); - List texts = xPathHelper.GetAttributes("resources", "name"); + List texts = xmlReader.GetAttributes("resources", "name"); for (int i = 0; i < texts.Count; i++) { - if (xPathHelper.GetValue("//resources/string[@name='" + texts[i] + "']", ref value, value)) + if (xmlReader.GetValue("//resources/string[@name='" + texts[i] + "']", ref value, value)) { try { @@ -296,11 +296,11 @@ namespace Vocaluxe.Base SLanguage lang = new SLanguage(); lang.LanguageFilePath = Path.Combine(CSettings.sFolderLanguages, FileName); - CXMLReader xPathHelper; + CXMLReader xmlReader; try { - xPathHelper = new CXMLReader(lang.LanguageFilePath); + xmlReader = new CXMLReader(lang.LanguageFilePath); } catch (Exception e) { @@ -309,7 +309,7 @@ namespace Vocaluxe.Base } string value = string.Empty; - if (xPathHelper.GetValue("//resources/string[@name='language']", ref value, value)) + if (xmlReader.GetValue("//resources/string[@name='language']", ref value, value)) { lang.Name = value; @@ -319,10 +319,10 @@ namespace Vocaluxe.Base lang.Texts = new Hashtable(); lang.PartyModeTexts = new List(); - List texts = xPathHelper.GetAttributes("resources", "name"); + List texts = xmlReader.GetAttributes("resources", "name"); for (int i = 0; i < texts.Count; i++) { - if (xPathHelper.GetValue("//resources/string[@name='" + texts[i] + "']", ref value, value)) + if (xmlReader.GetValue("//resources/string[@name='" + texts[i] + "']", ref value, value)) { try { diff --git a/Vocaluxe/Base/CParty.cs b/Vocaluxe/Base/CParty.cs index 6a27267d..650fab80 100644 --- a/Vocaluxe/Base/CParty.cs +++ b/Vocaluxe/Base/CParty.cs @@ -222,11 +222,11 @@ namespace Vocaluxe.Base pm.ScreenFiles = new List(); pm.NoErrors = false; - CXMLReader xPathHelper; + CXMLReader xmlReader; try { - xPathHelper = new CXMLReader(file); + xmlReader = new CXMLReader(file); } catch (Exception e) { @@ -237,16 +237,16 @@ namespace Vocaluxe.Base bool loaded = true; - loaded &= xPathHelper.TryGetIntValue("//root/PartyModeSystemVersion", ref pm.PartyModeSystemVersion); - loaded &= xPathHelper.GetValue("//root/Info/Name", ref pm.Name, "ERROR Name"); - loaded &= xPathHelper.GetValue("//root/Info/Description", ref pm.Description, "ERROR Description"); - loaded &= xPathHelper.GetValue("//root/Info/Author", ref pm.Author, "ERROR Author"); - loaded &= xPathHelper.GetValue("//root/Info/Folder", ref pm.Folder, "ERROR Folder"); - loaded &= xPathHelper.GetValue("//root/Info/PartyModeFile", ref pm.PartyModeFile, "ERROR PartyModeFile"); - loaded &= xPathHelper.GetInnerValues("PartyScreens", ref pm.ScreenFiles); - loaded &= xPathHelper.TryGetIntValue("//root/Info/PartyModeVersionMajor", ref pm.PartyModeVersionMajor); - loaded &= xPathHelper.TryGetIntValue("//root/Info/PartyModeVersionMinor", ref pm.PartyModeVersionMinor); - loaded &= xPathHelper.GetValue("//root/Info/TargetAudience", ref pm.TargetAudience, "ERROR TargetAudience"); + loaded &= xmlReader.TryGetIntValue("//root/PartyModeSystemVersion", ref pm.PartyModeSystemVersion); + loaded &= xmlReader.GetValue("//root/Info/Name", ref pm.Name, "ERROR Name"); + loaded &= xmlReader.GetValue("//root/Info/Description", ref pm.Description, "ERROR Description"); + loaded &= xmlReader.GetValue("//root/Info/Author", ref pm.Author, "ERROR Author"); + loaded &= xmlReader.GetValue("//root/Info/Folder", ref pm.Folder, "ERROR Folder"); + loaded &= xmlReader.GetValue("//root/Info/PartyModeFile", ref pm.PartyModeFile, "ERROR PartyModeFile"); + loaded &= xmlReader.GetInnerValues("PartyScreens", ref pm.ScreenFiles); + loaded &= xmlReader.TryGetIntValue("//root/Info/PartyModeVersionMajor", ref pm.PartyModeVersionMajor); + loaded &= xmlReader.TryGetIntValue("//root/Info/PartyModeVersionMinor", ref pm.PartyModeVersionMinor); + loaded &= xmlReader.GetValue("//root/Info/TargetAudience", ref pm.TargetAudience, "ERROR TargetAudience"); if (!loaded) { diff --git a/Vocaluxe/Base/CProfiles.cs b/Vocaluxe/Base/CProfiles.cs index 4d43aa2f..8b7712cc 100644 --- a/Vocaluxe/Base/CProfiles.cs +++ b/Vocaluxe/Base/CProfiles.cs @@ -361,11 +361,11 @@ namespace Vocaluxe.Base SProfile profile = new SProfile(); profile.ProfileFile = Path.Combine(CSettings.sFolderProfiles, FileName); - CXMLReader xPathHelper; + CXMLReader xmlReader; try { - xPathHelper = new CXMLReader(profile.ProfileFile); + xmlReader = new CXMLReader(profile.ProfileFile); } catch (Exception e) { @@ -374,24 +374,24 @@ namespace Vocaluxe.Base } string value = String.Empty; - if (xPathHelper.GetValue("//root/Info/PlayerName", ref value, value)) + if (xmlReader.GetValue("//root/Info/PlayerName", ref value, value)) { profile.PlayerName = value; profile.Difficulty = EGameDifficulty.TR_CONFIG_EASY; - xPathHelper.TryGetEnumValue("//root/Info/Difficulty", ref profile.Difficulty); + xmlReader.TryGetEnumValue("//root/Info/Difficulty", ref profile.Difficulty); profile.Avatar = new SAvatar(-1); - if (xPathHelper.GetValue("//root/Info/Avatar", ref value, value)) + if (xmlReader.GetValue("//root/Info/Avatar", ref value, value)) { profile.Avatar = GetAvatar(value); } profile.GuestProfile = EOffOn.TR_CONFIG_OFF; - xPathHelper.TryGetEnumValue("//root/Info/GuestProfile", ref profile.GuestProfile); + xmlReader.TryGetEnumValue("//root/Info/GuestProfile", ref profile.GuestProfile); profile.Active = EOffOn.TR_CONFIG_ON; - xPathHelper.TryGetEnumValue("//root/Info/Active", ref profile.Active); + xmlReader.TryGetEnumValue("//root/Info/Active", ref profile.Active); _Profiles.Add(profile); } diff --git a/Vocaluxe/Base/CTheme.cs b/Vocaluxe/Base/CTheme.cs index c4ba6824..6c5dcf13 100644 --- a/Vocaluxe/Base/CTheme.cs +++ b/Vocaluxe/Base/CTheme.cs @@ -147,11 +147,11 @@ namespace Vocaluxe.Base public static bool LoadSkin(int SkinIndex) { - CXMLReader xPathHelper; + CXMLReader xmlReader; try { - xPathHelper = new CXMLReader(Path.Combine(_Skins[SkinIndex].Path, _Skins[SkinIndex].FileName)); + xmlReader = new CXMLReader(Path.Combine(_Skins[SkinIndex].Path, _Skins[SkinIndex].FileName)); } catch (Exception e) { @@ -169,7 +169,7 @@ namespace Vocaluxe.Base { try { - xPathHelper.GetValue("//root/Skins/" + name, ref value, String.Empty); + xmlReader.GetValue("//root/Skins/" + name, ref value, String.Empty); SkinElement sk = _Skins[SkinIndex].SkinList[name]; sk.Value = value; sk.VideoIndex = -1; @@ -189,7 +189,7 @@ namespace Vocaluxe.Base { try { - xPathHelper.GetValue("//root/Videos/" + _Skins[SkinIndex].VideoList[i].Name, ref value, String.Empty); + xmlReader.GetValue("//root/Videos/" + _Skins[SkinIndex].VideoList[i].Name, ref value, String.Empty); SkinElement sk = new SkinElement(); sk.Name = _Skins[SkinIndex].VideoList[i].Name; sk.Value = value; @@ -207,7 +207,7 @@ namespace Vocaluxe.Base } // load colors - LoadColors(xPathHelper, SkinIndex); + LoadColors(xmlReader, SkinIndex); return true; } @@ -264,11 +264,11 @@ namespace Vocaluxe.Base return false; } - CXMLReader xPathHelper; + CXMLReader xmlReader; try { - xPathHelper = new CXMLReader(Path.Combine(_Themes[ThemeIndex].Path, _Themes[ThemeIndex].FileName)); + xmlReader = new CXMLReader(Path.Combine(_Themes[ThemeIndex].Path, _Themes[ThemeIndex].FileName)); } catch (Exception e) { @@ -280,7 +280,7 @@ namespace Vocaluxe.Base // Load Cursor if (_Themes[ThemeIndex].PartyModeID == -1) - LoadCursor(xPathHelper, skinIndex); + LoadCursor(xmlReader, skinIndex); // load fonts if (_Themes[ThemeIndex].PartyModeID == -1) @@ -288,13 +288,13 @@ namespace Vocaluxe.Base CFonts.LoadThemeFonts( _Themes[ThemeIndex].Name, Path.Combine(Path.Combine(_Themes[ThemeIndex].Path, _Themes[ThemeIndex].SkinFolder), CSettings.sFolderThemeFonts), - xPathHelper); + xmlReader); } else { CFonts.LoadPartyModeFonts(_Themes[ThemeIndex].PartyModeID, Path.Combine(_Themes[ThemeIndex].Path, CSettings.sFolderPartyModeFonts), - xPathHelper); + xmlReader); } return true; } @@ -420,11 +420,11 @@ namespace Vocaluxe.Base public static bool AddTheme(string FilePath, int PartyModeID) { - CXMLReader xPathHelper; + CXMLReader xmlReader; try { - xPathHelper = new CXMLReader(FilePath); + xmlReader = new CXMLReader(FilePath); } catch (Exception e) { @@ -435,17 +435,17 @@ namespace Vocaluxe.Base Theme theme = new Theme(); int version = 0; - xPathHelper.TryGetIntValue("//root/ThemeSystemVersion", ref version); + xmlReader.TryGetIntValue("//root/ThemeSystemVersion", ref version); if (version == ThemeSystemVersion) { - xPathHelper.GetValue("//root/Info/Name", ref theme.Name, String.Empty); + xmlReader.GetValue("//root/Info/Name", ref theme.Name, String.Empty); if (theme.Name != String.Empty) { - xPathHelper.GetValue("//root/Info/Author", ref theme.Author, String.Empty); - xPathHelper.GetValue("//root/Info/SkinFolder", ref theme.SkinFolder, String.Empty); - xPathHelper.TryGetIntValue("//root/Info/ThemeVersionMajor", ref theme.ThemeVersionMajor); - xPathHelper.TryGetIntValue("//root/Info/ThemeVersionMinor", ref theme.ThemeVersionMinor); + xmlReader.GetValue("//root/Info/Author", ref theme.Author, String.Empty); + xmlReader.GetValue("//root/Info/SkinFolder", ref theme.SkinFolder, String.Empty); + xmlReader.TryGetIntValue("//root/Info/ThemeVersionMajor", ref theme.ThemeVersionMajor); + xmlReader.TryGetIntValue("//root/Info/ThemeVersionMinor", ref theme.ThemeVersionMinor); theme.Path = Path.GetDirectoryName(FilePath); theme.FileName = Path.GetFileName(FilePath); theme.PartyModeID = PartyModeID; @@ -498,11 +498,11 @@ namespace Vocaluxe.Base foreach (string file in files) { - CXMLReader xPathHelper; + CXMLReader xmlReader; try { - xPathHelper = new CXMLReader(Path.Combine(path, file)); + xmlReader = new CXMLReader(Path.Combine(path, file)); } catch (Exception e) { @@ -513,16 +513,16 @@ namespace Vocaluxe.Base Skin skin = new Skin(); int version = 0; - xPathHelper.TryGetIntValue("//root/SkinSystemVersion", ref version); + xmlReader.TryGetIntValue("//root/SkinSystemVersion", ref version); if (version == SkinSystemVersion) { - xPathHelper.GetValue("//root/Info/Name", ref skin.Name, String.Empty); + xmlReader.GetValue("//root/Info/Name", ref skin.Name, String.Empty); if (skin.Name != String.Empty) { - xPathHelper.GetValue("//root/Info/Author", ref skin.Author, String.Empty); - xPathHelper.TryGetIntValue("//root/Info/SkinVersionMajor", ref skin.SkinVersionMajor); - xPathHelper.TryGetIntValue("//root/Info/SkinVersionMinor", ref skin.SkinVersionMinor); + xmlReader.GetValue("//root/Info/Author", ref skin.Author, String.Empty); + xmlReader.TryGetIntValue("//root/Info/SkinVersionMajor", ref skin.SkinVersionMajor); + xmlReader.TryGetIntValue("//root/Info/SkinVersionMinor", ref skin.SkinVersionMinor); skin.Path = path; @@ -530,7 +530,7 @@ namespace Vocaluxe.Base skin.PartyModeID = theme.PartyModeID; skin.SkinList = new Dictionary(); - List names = xPathHelper.GetValues("Skins"); + List names = xmlReader.GetValues("Skins"); foreach (string str in names) { SkinElement sk = new SkinElement(); @@ -540,7 +540,7 @@ namespace Vocaluxe.Base } skin.VideoList = new List(); - names = xPathHelper.GetValues("Videos"); + names = xmlReader.GetValues("Videos"); foreach (string str in names) { SkinElement sk = new SkinElement(); @@ -754,7 +754,7 @@ namespace Vocaluxe.Base #endregion Theme and Skin index handling #region Element loading - private static void LoadColors(CXMLReader xPathHelper, int SkinIndex) + private static void LoadColors(CXMLReader xmlReader, int SkinIndex) { Skin skin = _Skins[SkinIndex]; @@ -764,14 +764,14 @@ namespace Vocaluxe.Base float value = 0f; int i = 1; - while (xPathHelper.TryGetFloatValue("//root/Colors/Player" + i.ToString() + "/R", ref value)) + while (xmlReader.TryGetFloatValue("//root/Colors/Player" + i.ToString() + "/R", ref value)) { SColorF color = new SColorF(); color.R = value; - xPathHelper.TryGetFloatValue("//root/Colors/Player" + i.ToString() + "/G", ref color.G); - xPathHelper.TryGetFloatValue("//root/Colors/Player" + i.ToString() + "/B", ref color.B); - xPathHelper.TryGetFloatValue("//root/Colors/Player" + i.ToString() + "/A", ref color.A); + xmlReader.TryGetFloatValue("//root/Colors/Player" + i.ToString() + "/G", ref color.G); + xmlReader.TryGetFloatValue("//root/Colors/Player" + i.ToString() + "/B", ref color.B); + xmlReader.TryGetFloatValue("//root/Colors/Player" + i.ToString() + "/A", ref color.A); PlayerColors.Add(color); i++; @@ -780,16 +780,16 @@ namespace Vocaluxe.Base } List ColorScheme = new List(); - List names = xPathHelper.GetValues("ColorSchemes"); + List names = xmlReader.GetValues("ColorSchemes"); foreach (string str in names) { SColorScheme scheme = new SColorScheme(); scheme.Name = str; - xPathHelper.TryGetFloatValue("//root/ColorSchemes/" + str + "/R", ref scheme.Color.R); - xPathHelper.TryGetFloatValue("//root/ColorSchemes/" + str + "/G", ref scheme.Color.G); - xPathHelper.TryGetFloatValue("//root/ColorSchemes/" + str + "/B", ref scheme.Color.B); - xPathHelper.TryGetFloatValue("//root/ColorSchemes/" + str + "/A", ref scheme.Color.A); + xmlReader.TryGetFloatValue("//root/ColorSchemes/" + str + "/R", ref scheme.Color.R); + xmlReader.TryGetFloatValue("//root/ColorSchemes/" + str + "/G", ref scheme.Color.G); + xmlReader.TryGetFloatValue("//root/ColorSchemes/" + str + "/B", ref scheme.Color.B); + xmlReader.TryGetFloatValue("//root/ColorSchemes/" + str + "/A", ref scheme.Color.A); ColorScheme.Add(scheme); } @@ -798,15 +798,15 @@ namespace Vocaluxe.Base _Skins[SkinIndex] = skin; } - private static void LoadCursor(CXMLReader xPathHelper, int SkinIndex) + private static void LoadCursor(CXMLReader xmlReader, int SkinIndex) { string value = String.Empty; - xPathHelper.GetValue("//root/Cursor/Skin", ref Cursor.SkinName, value); + xmlReader.GetValue("//root/Cursor/Skin", ref Cursor.SkinName, value); - xPathHelper.TryGetFloatValue("//root/Cursor/W", ref Cursor.w); - xPathHelper.TryGetFloatValue("//root/Cursor/H", ref Cursor.h); + xmlReader.TryGetFloatValue("//root/Cursor/W", ref Cursor.w); + xmlReader.TryGetFloatValue("//root/Cursor/H", ref Cursor.h); - if (xPathHelper.GetValue("//root/Cursor/Color", ref value, value)) + if (xmlReader.GetValue("//root/Cursor/Color", ref value, value)) { SColorF color = GetColor(value, _Skins[SkinIndex].PartyModeID); Cursor.r = color.R; @@ -818,10 +818,10 @@ namespace Vocaluxe.Base else { Cursor.color = String.Empty; - xPathHelper.TryGetFloatValue("//root/Cursor/R", ref Cursor.r); - xPathHelper.TryGetFloatValue("//root/Cursor/G", ref Cursor.g); - xPathHelper.TryGetFloatValue("//root/Cursor/B", ref Cursor.b); - xPathHelper.TryGetFloatValue("//root/Cursor/A", ref Cursor.a); + xmlReader.TryGetFloatValue("//root/Cursor/R", ref Cursor.r); + xmlReader.TryGetFloatValue("//root/Cursor/G", ref Cursor.g); + xmlReader.TryGetFloatValue("//root/Cursor/B", ref Cursor.b); + xmlReader.TryGetFloatValue("//root/Cursor/A", ref Cursor.a); } } #endregion Element loading diff --git a/Vocaluxe/Lib/Playlist/CPlaylistFile.cs b/Vocaluxe/Lib/Playlist/CPlaylistFile.cs index 412948dc..db08989d 100644 --- a/Vocaluxe/Lib/Playlist/CPlaylistFile.cs +++ b/Vocaluxe/Lib/Playlist/CPlaylistFile.cs @@ -121,11 +121,11 @@ namespace Vocaluxe.Lib.Playlist private void LoadPlaylist() { - CXMLReader xPathHelper; + CXMLReader xmlReader; try { - xPathHelper = new CXMLReader(PlaylistFile); + xmlReader = new CXMLReader(PlaylistFile); } catch (Exception e) { @@ -134,22 +134,22 @@ namespace Vocaluxe.Lib.Playlist } string value = String.Empty; - if (xPathHelper.GetValue("//root/Info/PlaylistName", ref value, value)) + if (xmlReader.GetValue("//root/Info/PlaylistName", ref value, value)) { PlaylistName = value; Songs = new List(); - List songs = xPathHelper.GetValues("Songs"); + List songs = xmlReader.GetValues("Songs"); string artist = String.Empty; string title = String.Empty; EGameMode gm = EGameMode.TR_GAMEMODE_NORMAL; for (int i = 0; i < songs.Count; i++) { - xPathHelper.GetValue("//root/Songs/" + songs[i] + "/Artist", ref artist, String.Empty); - xPathHelper.GetValue("//root/Songs/" + songs[i] + "/Title", ref title, String.Empty); - xPathHelper.TryGetEnumValue("//root/Songs/" + songs[i] + "/GameMode", ref gm); + xmlReader.GetValue("//root/Songs/" + songs[i] + "/Artist", ref artist, String.Empty); + xmlReader.GetValue("//root/Songs/" + songs[i] + "/Title", ref title, String.Empty); + xmlReader.TryGetEnumValue("//root/Songs/" + songs[i] + "/GameMode", ref gm); CPlaylistSong song = new CPlaylistSong(); song.SongID = -1; diff --git a/VocaluxeLib/Menu/CBackground.cs b/VocaluxeLib/Menu/CBackground.cs index 042bcd30..bc9a1012 100644 --- a/VocaluxeLib/Menu/CBackground.cs +++ b/VocaluxeLib/Menu/CBackground.cs @@ -54,28 +54,28 @@ namespace Vocaluxe.Menu #endregion Constructors #region public - public bool LoadTheme(string XmlPath, string ElementName, CXMLReader xPathHelper, int SkinIndex) + public bool LoadTheme(string XmlPath, string ElementName, CXMLReader xmlReader, int SkinIndex) { string item = XmlPath + "/" + ElementName; _ThemeLoaded = true; - _ThemeLoaded &= xPathHelper.TryGetEnumValue(item + "/Type", ref _Theme.Type); + _ThemeLoaded &= xmlReader.TryGetEnumValue(item + "/Type", ref _Theme.Type); - bool vid = xPathHelper.GetValue(item + "/Video", ref _Theme.VideoName, String.Empty); - bool tex = xPathHelper.GetValue(item + "/Skin", ref _Theme.TextureName, String.Empty); + bool vid = xmlReader.GetValue(item + "/Video", ref _Theme.VideoName, String.Empty); + bool tex = xmlReader.GetValue(item + "/Skin", ref _Theme.TextureName, String.Empty); _ThemeLoaded &= vid || tex || _Theme.Type == EBackgroundTypes.None; - if (xPathHelper.GetValue(item + "/Color", ref _Theme.ColorName, String.Empty)) + if (xmlReader.GetValue(item + "/Color", ref _Theme.ColorName, String.Empty)) { _ThemeLoaded &= _Base.Theme.GetColor(_Theme.ColorName, SkinIndex, ref Color); } else { bool success = true; - success &= xPathHelper.TryGetFloatValue(item + "/R", ref Color.R); - success &= xPathHelper.TryGetFloatValue(item + "/G", ref Color.G); - success &= xPathHelper.TryGetFloatValue(item + "/B", ref Color.B); - success &= xPathHelper.TryGetFloatValue(item + "/A", ref Color.A); + success &= xmlReader.TryGetFloatValue(item + "/R", ref Color.R); + success &= xmlReader.TryGetFloatValue(item + "/G", ref Color.G); + success &= xmlReader.TryGetFloatValue(item + "/B", ref Color.B); + success &= xmlReader.TryGetFloatValue(item + "/A", ref Color.A); if (_Theme.Type != EBackgroundTypes.None) _ThemeLoaded &= success; diff --git a/VocaluxeLib/Menu/CButton.cs b/VocaluxeLib/Menu/CButton.cs index 57bbd0e2..6f6d1153 100644 --- a/VocaluxeLib/Menu/CButton.cs +++ b/VocaluxeLib/Menu/CButton.cs @@ -134,69 +134,69 @@ namespace Vocaluxe.Menu SReflectionSpace = button.SReflectionSpace; } - public bool LoadTheme(string XmlPath, string ElementName, CXMLReader xPathHelper, int SkinIndex) + public bool LoadTheme(string XmlPath, string ElementName, CXMLReader xmlReader, int SkinIndex) { string item = XmlPath + "/" + ElementName; _ThemeLoaded = true; - _ThemeLoaded &= xPathHelper.GetValue(item + "/Skin", ref _Theme.TextureName, String.Empty); - _ThemeLoaded &= xPathHelper.GetValue(item + "/SkinSelected", ref _Theme.STextureName, String.Empty); + _ThemeLoaded &= xmlReader.GetValue(item + "/Skin", ref _Theme.TextureName, String.Empty); + _ThemeLoaded &= xmlReader.GetValue(item + "/SkinSelected", ref _Theme.STextureName, String.Empty); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/X", ref Rect.X); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/Y", ref Rect.Y); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/Z", ref Rect.Z); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/W", ref Rect.W); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/H", ref Rect.H); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/X", ref Rect.X); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Y", ref Rect.Y); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Z", ref Rect.Z); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/W", ref Rect.W); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/H", ref Rect.H); - if (xPathHelper.GetValue(item + "/Color", ref _Theme.ColorName, String.Empty)) + if (xmlReader.GetValue(item + "/Color", ref _Theme.ColorName, String.Empty)) { _ThemeLoaded &= _Base.Theme.GetColor(_Theme.ColorName, SkinIndex, ref Color); } else { - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/R", ref Color.R); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/G", ref Color.G); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/B", ref Color.B); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/A", ref Color.A); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/R", ref Color.R); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/G", ref Color.G); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/B", ref Color.B); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/A", ref Color.A); } - if (xPathHelper.GetValue(item + "/SColor", ref _Theme.SColorName, String.Empty)) + if (xmlReader.GetValue(item + "/SColor", ref _Theme.SColorName, String.Empty)) { _ThemeLoaded &= _Base.Theme.GetColor(_Theme.SColorName, SkinIndex, ref SColor); } else { - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/SR", ref SColor.R); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/SG", ref SColor.G); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/SB", ref SColor.B); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/SA", ref SColor.A); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/SR", ref SColor.R); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/SG", ref SColor.G); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/SB", ref SColor.B); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/SA", ref SColor.A); } - _ThemeLoaded &= Text.LoadTheme(item, "Text", xPathHelper, SkinIndex, true); + _ThemeLoaded &= Text.LoadTheme(item, "Text", xmlReader, SkinIndex, true); Text.Z = Rect.Z; - if (xPathHelper.ItemExists(item + "/SText")) + if (xmlReader.ItemExists(item + "/SText")) { SelText = true; - _ThemeLoaded &= SText.LoadTheme(item, "SText", xPathHelper, SkinIndex, true); + _ThemeLoaded &= SText.LoadTheme(item, "SText", xmlReader, SkinIndex, true); SText.Z = Rect.Z; } //Reflections - if (xPathHelper.ItemExists(item + "/Reflection")) + if (xmlReader.ItemExists(item + "/Reflection")) { Reflection = true; - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/Reflection/Space", ref ReflectionSpace); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/Reflection/Height", ref ReflectionHeight); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Reflection/Space", ref ReflectionSpace); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Reflection/Height", ref ReflectionHeight); } else Reflection = false; - if (xPathHelper.ItemExists(item + "/SReflection")) + if (xmlReader.ItemExists(item + "/SReflection")) { SReflection = true; - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/SReflection/Space", ref SReflectionSpace); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/SReflection/Height", ref SReflectionHeight); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/SReflection/Space", ref SReflectionSpace); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/SReflection/Height", ref SReflectionHeight); } else SReflection = false; diff --git a/VocaluxeLib/Menu/CEqualizer.cs b/VocaluxeLib/Menu/CEqualizer.cs index 101fecec..006bc76b 100644 --- a/VocaluxeLib/Menu/CEqualizer.cs +++ b/VocaluxeLib/Menu/CEqualizer.cs @@ -72,57 +72,57 @@ namespace Vocaluxe.Menu ReflectionHeight = 0f; } - public bool LoadTheme(string XmlPath, string ElementName, CXMLReader xPathHelper, int SkinIndex) + public bool LoadTheme(string XmlPath, string ElementName, CXMLReader xmlReader, int SkinIndex) { string item = XmlPath + "/" + ElementName; _ThemeLoaded = true; - _ThemeLoaded &= xPathHelper.GetValue(item + "/Skin", ref _Theme.TextureName, String.Empty); + _ThemeLoaded &= xmlReader.GetValue(item + "/Skin", ref _Theme.TextureName, String.Empty); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/X", ref Rect.X); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/Y", ref Rect.Y); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/Z", ref Rect.Z); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/W", ref Rect.W); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/H", ref Rect.H); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/X", ref Rect.X); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Y", ref Rect.Y); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Z", ref Rect.Z); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/W", ref Rect.W); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/H", ref Rect.H); - _ThemeLoaded &= xPathHelper.TryGetIntValue(item + "/NumBars", ref _Theme.NumBars); + _ThemeLoaded &= xmlReader.TryGetIntValue(item + "/NumBars", ref _Theme.NumBars); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/Space", ref Space); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Space", ref Space); - _ThemeLoaded &= xPathHelper.TryGetEnumValue(item + "/Style", ref _Theme.Style); + _ThemeLoaded &= xmlReader.TryGetEnumValue(item + "/Style", ref _Theme.Style); - _ThemeLoaded &= xPathHelper.TryGetEnumValue(item + "/DrawNegative", ref _Theme.DrawNegative); + _ThemeLoaded &= xmlReader.TryGetEnumValue(item + "/DrawNegative", ref _Theme.DrawNegative); - if (xPathHelper.GetValue(item + "/Color", ref _Theme.ColorName, String.Empty)) + if (xmlReader.GetValue(item + "/Color", ref _Theme.ColorName, String.Empty)) { _ThemeLoaded &= _Base.Theme.GetColor(_Theme.ColorName, SkinIndex, ref Color); } else { - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/R", ref Color.R); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/G", ref Color.G); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/B", ref Color.B); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/A", ref Color.A); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/R", ref Color.R); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/G", ref Color.G); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/B", ref Color.B); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/A", ref Color.A); } - if (xPathHelper.GetValue(item + "/MaxColor", ref _Theme.MaxColorName, String.Empty)) + if (xmlReader.GetValue(item + "/MaxColor", ref _Theme.MaxColorName, String.Empty)) { _ThemeLoaded &= _Base.Theme.GetColor(_Theme.ColorName, SkinIndex, ref Color); } else { - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/MaxR", ref MaxColor.R); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/MaxG", ref MaxColor.G); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/MaxB", ref MaxColor.B); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/MaxA", ref MaxColor.A); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/MaxR", ref MaxColor.R); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/MaxG", ref MaxColor.G); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/MaxB", ref MaxColor.B); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/MaxA", ref MaxColor.A); } //Reflection - if (xPathHelper.ItemExists(item + "/Reflection")) + if (xmlReader.ItemExists(item + "/Reflection")) { Reflection = true; - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/Reflection/Space", ref ReflectionSpace); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/Reflection/Height", ref ReflectionHeight); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Reflection/Space", ref ReflectionSpace); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Reflection/Height", ref ReflectionHeight); } else Reflection = false; diff --git a/VocaluxeLib/Menu/CLyric.cs b/VocaluxeLib/Menu/CLyric.cs index 02d19602..5b356576 100644 --- a/VocaluxeLib/Menu/CLyric.cs +++ b/VocaluxeLib/Menu/CLyric.cs @@ -107,39 +107,39 @@ namespace Vocaluxe.Menu _Style = ELyricStyle.Fill; } - public bool LoadTheme(string XmlPath, string ElementName, CXMLReader xPathHelper, int SkinIndex) + public bool LoadTheme(string XmlPath, string ElementName, CXMLReader xmlReader, int SkinIndex) { string item = XmlPath + "/" + ElementName; _ThemeLoaded = true; - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/X", ref _X); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/Y", ref _Y); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/Z", ref _Z); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/W", ref _MaxW); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/H", ref _H); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/X", ref _X); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Y", ref _Y); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Z", ref _Z); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/W", ref _MaxW); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/H", ref _H); - if (xPathHelper.GetValue(item + "/Color", ref _Theme.ColorName, String.Empty)) + if (xmlReader.GetValue(item + "/Color", ref _Theme.ColorName, String.Empty)) { _ThemeLoaded &= _Base.Theme.GetColor(_Theme.ColorName, SkinIndex, ref Color); } else { - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/R", ref Color.R); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/G", ref Color.G); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/B", ref Color.B); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/A", ref Color.A); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/R", ref Color.R); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/G", ref Color.G); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/B", ref Color.B); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/A", ref Color.A); } - if (xPathHelper.GetValue(item + "/SColor", ref _Theme.SColorName, String.Empty)) + if (xmlReader.GetValue(item + "/SColor", ref _Theme.SColorName, String.Empty)) { _ThemeLoaded &= _Base.Theme.GetColor(_Theme.SColorName, SkinIndex, ref ColorProcessed); } else { - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/SR", ref ColorProcessed.R); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/SG", ref ColorProcessed.G); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/SB", ref ColorProcessed.B); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/SA", ref ColorProcessed.A); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/SR", ref ColorProcessed.R); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/SG", ref ColorProcessed.G); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/SB", ref ColorProcessed.B); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/SA", ref ColorProcessed.A); } if (_ThemeLoaded) diff --git a/VocaluxeLib/Menu/CMenu.cs b/VocaluxeLib/Menu/CMenu.cs index fbfbd31b..223d920f 100644 --- a/VocaluxeLib/Menu/CMenu.cs +++ b/VocaluxeLib/Menu/CMenu.cs @@ -175,37 +175,37 @@ namespace Vocaluxe.Menu { string file = Path.Combine(XmlPath, _ThemeName + ".xml"); - CXMLReader xPathHelper = null; + CXMLReader xmlReader = null; try { - xPathHelper = new CXMLReader(file); + xmlReader = new CXMLReader(file); } catch (Exception e) { - if (xPathHelper != null) - xPathHelper = null; + if (xmlReader != null) + xmlReader = null; _Base.Log.LogError("Error loading theme file " + file + ": " + e.Message); } bool VersionCheck = false; - if (xPathHelper != null) - VersionCheck = CheckVersion(_ScreenVersion, xPathHelper); + if (xmlReader != null) + VersionCheck = CheckVersion(_ScreenVersion, xmlReader); int SkinIndex = _Base.Theme.GetSkinIndex(_PartyModeID); - if (xPathHelper != null && VersionCheck && SkinIndex != -1) + if (xmlReader != null && VersionCheck && SkinIndex != -1) { _ThemePath = XmlPath; - LoadThemeBasics(xPathHelper, SkinIndex); + LoadThemeBasics(xmlReader, SkinIndex); if (_ThemeBackgrounds != null) { for (int i = 0; i < _ThemeBackgrounds.Length; i++) { CBackground background = new CBackground(_Base, _PartyModeID); - if (background.LoadTheme("//root/" + _ThemeName, _ThemeBackgrounds[i], xPathHelper, SkinIndex)) + if (background.LoadTheme("//root/" + _ThemeName, _ThemeBackgrounds[i], xmlReader, SkinIndex)) { _htBackgrounds.Add(_ThemeBackgrounds[i], AddBackground(background)); } @@ -221,7 +221,7 @@ namespace Vocaluxe.Menu for (int i = 0; i < _ThemeStatics.Length; i++) { CStatic stat = new CStatic(_Base, _PartyModeID); - if (stat.LoadTheme("//root/" + _ThemeName, _ThemeStatics[i], xPathHelper, SkinIndex)) + if (stat.LoadTheme("//root/" + _ThemeName, _ThemeStatics[i], xmlReader, SkinIndex)) { _htStatics.Add(_ThemeStatics[i], AddStatic(stat)); } @@ -237,7 +237,7 @@ namespace Vocaluxe.Menu for (int i = 0; i < _ThemeTexts.Length; i++) { CText text = new CText(_Base, _PartyModeID); - if (text.LoadTheme("//root/" + _ThemeName, _ThemeTexts[i], xPathHelper, SkinIndex)) + if (text.LoadTheme("//root/" + _ThemeName, _ThemeTexts[i], xmlReader, SkinIndex)) { _htTexts.Add(_ThemeTexts[i], AddText(text)); } @@ -253,7 +253,7 @@ namespace Vocaluxe.Menu for (int i = 0; i < _ThemeButtons.Length; i++) { CButton button = new CButton(_Base, _PartyModeID); - if (button.LoadTheme("//root/" + _ThemeName, _ThemeButtons[i], xPathHelper, SkinIndex)) + if (button.LoadTheme("//root/" + _ThemeName, _ThemeButtons[i], xmlReader, SkinIndex)) { _htButtons.Add(_ThemeButtons[i], AddButton(button)); } @@ -269,7 +269,7 @@ namespace Vocaluxe.Menu for (int i = 0; i < _ThemeSelectSlides.Length; i++) { CSelectSlide slide = new CSelectSlide(_Base, _PartyModeID); - if (slide.LoadTheme("//root/" + _ThemeName, _ThemeSelectSlides[i], xPathHelper, SkinIndex)) + if (slide.LoadTheme("//root/" + _ThemeName, _ThemeSelectSlides[i], xmlReader, SkinIndex)) { _htSelectSlides.Add(_ThemeSelectSlides[i], AddSelectSlide(slide)); } @@ -285,7 +285,7 @@ namespace Vocaluxe.Menu for (int i = 0; i < _ThemeSongMenus.Length; i++) { CSongMenu sm = new CSongMenu(_Base, _PartyModeID); - if (sm.LoadTheme("//root/" + _ThemeName, _ThemeSongMenus[i], xPathHelper, SkinIndex)) + if (sm.LoadTheme("//root/" + _ThemeName, _ThemeSongMenus[i], xmlReader, SkinIndex)) { _htSongMenus.Add(_ThemeSongMenus[i], AddSongMenu(sm)); } @@ -301,7 +301,7 @@ namespace Vocaluxe.Menu for (int i = 0; i < _ThemeLyrics.Length; i++) { CLyric lyric = new CLyric(_Base, _PartyModeID); - if (lyric.LoadTheme("//root/" + _ThemeName, _ThemeLyrics[i], xPathHelper, SkinIndex)) + if (lyric.LoadTheme("//root/" + _ThemeName, _ThemeLyrics[i], xmlReader, SkinIndex)) { _htLyrics.Add(_ThemeLyrics[i], AddLyric(lyric)); } @@ -317,7 +317,7 @@ namespace Vocaluxe.Menu for (int i = 0; i < _ThemeSingNotes.Length; i++) { CSingNotes notes = new CSingNotesClassic(_Base, _PartyModeID); - if (notes.LoadTheme("//root/" + _ThemeName, _ThemeSingNotes[i], xPathHelper, SkinIndex)) + if (notes.LoadTheme("//root/" + _ThemeName, _ThemeSingNotes[i], xmlReader, SkinIndex)) { _htSingNotes.Add(_ThemeSingNotes[i], AddSingNote(notes)); } @@ -333,7 +333,7 @@ namespace Vocaluxe.Menu for (int i = 0; i < _ThemeNameSelections.Length; i++) { CNameSelection nsel = new CNameSelection(_Base, _PartyModeID); - if (nsel.LoadTheme("//root/" + _ThemeName, _ThemeNameSelections[i], xPathHelper, SkinIndex)) + if (nsel.LoadTheme("//root/" + _ThemeName, _ThemeNameSelections[i], xmlReader, SkinIndex)) { _htNameSelections.Add(_ThemeNameSelections[i], AddNameSelection(nsel)); } @@ -349,7 +349,7 @@ namespace Vocaluxe.Menu for (int i = 0; i < _ThemeEqualizers.Length; i++) { CEqualizer eq = new CEqualizer(_Base, _PartyModeID); - if (eq.LoadTheme("//root/" + _ThemeName, _ThemeEqualizers[i], xPathHelper, SkinIndex)) + if (eq.LoadTheme("//root/" + _ThemeName, _ThemeEqualizers[i], xmlReader, SkinIndex)) { _htEqualizers.Add(_ThemeEqualizers[i], AddEqualizer(eq)); } @@ -365,7 +365,7 @@ namespace Vocaluxe.Menu for (int i = 0; i < _ThemePlaylists.Length; i++) { CPlaylist pls = new CPlaylist(_Base, _PartyModeID); - if (pls.LoadTheme("//root/" + _ThemeName, _ThemePlaylists[i], xPathHelper, SkinIndex)) + if (pls.LoadTheme("//root/" + _ThemeName, _ThemePlaylists[i], xmlReader, SkinIndex)) { _htPlaylists.Add(_ThemePlaylists[i], AddPlaylist(pls)); } @@ -381,7 +381,7 @@ namespace Vocaluxe.Menu for (int i = 0; i < _ThemeParticleEffects.Length; i++) { CParticleEffect pe = new CParticleEffect(_Base, _PartyModeID); - if (pe.LoadTheme("//root/" + _ThemeName, _ThemeParticleEffects[i], xPathHelper, SkinIndex)) + if (pe.LoadTheme("//root/" + _ThemeName, _ThemeParticleEffects[i], xmlReader, SkinIndex)) { _htParticleEffects.Add(_ThemeParticleEffects[i], AddParticleEffect(pe)); } @@ -397,7 +397,7 @@ namespace Vocaluxe.Menu for (int i = 0; i < _ThemeScreenSettings.Length; i++) { CScreenSetting se = new CScreenSetting(_Base, _PartyModeID); - if (se.LoadTheme("//root/" + _ThemeName, _ThemeScreenSettings[i], xPathHelper, SkinIndex)) + if (se.LoadTheme("//root/" + _ThemeName, _ThemeScreenSettings[i], xmlReader, SkinIndex)) { _htScreenSettings.Add(_ThemeScreenSettings[i], AddScreenSetting(se)); } @@ -2503,10 +2503,10 @@ namespace Vocaluxe.Menu } } - private bool CheckVersion(int Version, CXMLReader xPathHelper) + private bool CheckVersion(int Version, CXMLReader xmlReader) { int version = 0; - xPathHelper.TryGetIntValue("//root/" + _ThemeName + "/ScreenVersion", ref version); + xmlReader.TryGetIntValue("//root/" + _ThemeName + "/ScreenVersion", ref version); if (version == Version) return true; @@ -2524,14 +2524,14 @@ namespace Vocaluxe.Menu return false; } - private void LoadThemeBasics(CXMLReader xPathHelper, int SkinIndex) + private void LoadThemeBasics(CXMLReader xmlReader, int SkinIndex) { string value = String.Empty; // Backgrounds CBackground background = new CBackground(_Base, _PartyModeID); int i = 1; - while (background.LoadTheme("//root/" + _ThemeName, "Background" + i.ToString(), xPathHelper, SkinIndex)) + while (background.LoadTheme("//root/" + _ThemeName, "Background" + i.ToString(), xmlReader, SkinIndex)) { AddBackground(background); background = new CBackground(_Base, _PartyModeID); @@ -2541,7 +2541,7 @@ namespace Vocaluxe.Menu // Statics CStatic stat = new CStatic(_Base, _PartyModeID); i = 1; - while (stat.LoadTheme("//root/" + _ThemeName, "Static" + i.ToString(), xPathHelper, SkinIndex)) + while (stat.LoadTheme("//root/" + _ThemeName, "Static" + i.ToString(), xmlReader, SkinIndex)) { AddStatic(stat); stat = new CStatic(_Base, _PartyModeID); @@ -2551,7 +2551,7 @@ namespace Vocaluxe.Menu // Texts CText text = new CText(_Base, _PartyModeID); i = 1; - while (text.LoadTheme("//root/" + _ThemeName, "Text" + i.ToString(), xPathHelper, SkinIndex)) + while (text.LoadTheme("//root/" + _ThemeName, "Text" + i.ToString(), xmlReader, SkinIndex)) { AddText(text); text = new CText(_Base, _PartyModeID); @@ -2561,7 +2561,7 @@ namespace Vocaluxe.Menu // ParticleEffects CParticleEffect partef = new CParticleEffect(_Base, _PartyModeID); i = 1; - while (partef.LoadTheme("//root/" + _ThemeName, "ParticleEffect" + i.ToString(), xPathHelper, SkinIndex)) + while (partef.LoadTheme("//root/" + _ThemeName, "ParticleEffect" + i.ToString(), xmlReader, SkinIndex)) { AddParticleEffect(partef); partef = new CParticleEffect(_Base, _PartyModeID); diff --git a/VocaluxeLib/Menu/CNameSelection.cs b/VocaluxeLib/Menu/CNameSelection.cs index cc76bce8..176ed0c9 100644 --- a/VocaluxeLib/Menu/CNameSelection.cs +++ b/VocaluxeLib/Menu/CNameSelection.cs @@ -108,54 +108,54 @@ namespace Vocaluxe.Menu UpdateList(0); } - public bool LoadTheme(string XmlPath, string ElementName, CXMLReader xPathHelper, int SkinIndex) + public bool LoadTheme(string XmlPath, string ElementName, CXMLReader xmlReader, int SkinIndex) { string item = XmlPath + "/" + ElementName; _ThemeLoaded = true; - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/X", ref Rect.X); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/Y", ref Rect.Y); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/Z", ref Rect.Z); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/W", ref Rect.W); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/H", ref Rect.H); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/X", ref Rect.X); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Y", ref Rect.Y); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Z", ref Rect.Z); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/W", ref Rect.W); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/H", ref Rect.H); - _ThemeLoaded &= xPathHelper.GetValue(item + "/SkinEmptyTile", ref _Theme.TextureEmptyTileName, String.Empty); + _ThemeLoaded &= xmlReader.GetValue(item + "/SkinEmptyTile", ref _Theme.TextureEmptyTileName, String.Empty); - if (xPathHelper.GetValue(item + "/ColorEmptyTile", ref _Theme.ColorEmptyTileName, String.Empty)) + if (xmlReader.GetValue(item + "/ColorEmptyTile", ref _Theme.ColorEmptyTileName, String.Empty)) { _ThemeLoaded &= _Base.Theme.GetColor(_Theme.ColorEmptyTileName, SkinIndex, ref ColorEmptyTile); } else { - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/R", ref ColorEmptyTile.R); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/G", ref ColorEmptyTile.G); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/B", ref ColorEmptyTile.B); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/A", ref ColorEmptyTile.A); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/R", ref ColorEmptyTile.R); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/G", ref ColorEmptyTile.G); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/B", ref ColorEmptyTile.B); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/A", ref ColorEmptyTile.A); } - _ThemeLoaded &= xPathHelper.GetValue(item + "/SkinTileSelected", ref _Theme.TextureTileSelectedName, String.Empty); + _ThemeLoaded &= xmlReader.GetValue(item + "/SkinTileSelected", ref _Theme.TextureTileSelectedName, String.Empty); - _ThemeLoaded &= xPathHelper.TryGetIntValue(item + "/Tiles/W", ref _TileW); - _ThemeLoaded &= xPathHelper.TryGetIntValue(item + "/Tiles/H", ref _TileH); - _ThemeLoaded &= xPathHelper.TryGetIntValue(item + "/Tiles/NumW", ref _NumW); - _ThemeLoaded &= xPathHelper.TryGetIntValue(item + "/Tiles/NumH", ref _NumH); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/Tiles/SpaceW", ref _SpaceW); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/Tiles/SpaceH", ref _SpaceH); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/Tiles/Name/Space", ref _Theme.NameSpace); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/Tiles/Name/H", ref _Theme.NameHeight); - _ThemeLoaded &= xPathHelper.GetValue(item + "/Tiles/Name/Font", ref _Theme.NameFont, "Normal"); - _ThemeLoaded &= xPathHelper.TryGetEnumValue(item + "/Tiles/Name/Style", ref _Theme.NameStyle); - if (xPathHelper.GetValue(item + "/Tiles/Name/Color", ref _Theme.NameColorName, String.Empty)) + _ThemeLoaded &= xmlReader.TryGetIntValue(item + "/Tiles/W", ref _TileW); + _ThemeLoaded &= xmlReader.TryGetIntValue(item + "/Tiles/H", ref _TileH); + _ThemeLoaded &= xmlReader.TryGetIntValue(item + "/Tiles/NumW", ref _NumW); + _ThemeLoaded &= xmlReader.TryGetIntValue(item + "/Tiles/NumH", ref _NumH); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Tiles/SpaceW", ref _SpaceW); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Tiles/SpaceH", ref _SpaceH); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Tiles/Name/Space", ref _Theme.NameSpace); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Tiles/Name/H", ref _Theme.NameHeight); + _ThemeLoaded &= xmlReader.GetValue(item + "/Tiles/Name/Font", ref _Theme.NameFont, "Normal"); + _ThemeLoaded &= xmlReader.TryGetEnumValue(item + "/Tiles/Name/Style", ref _Theme.NameStyle); + if (xmlReader.GetValue(item + "/Tiles/Name/Color", ref _Theme.NameColorName, String.Empty)) { _ThemeLoaded &= _Base.Theme.GetColor(_Theme.NameColorName, SkinIndex, ref _Theme.NameColor); } else { - if (xPathHelper.TryGetFloatValue(item + "/Tiles/Name/R", ref _Theme.NameColor.R)) + if (xmlReader.TryGetFloatValue(item + "/Tiles/Name/R", ref _Theme.NameColor.R)) { - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/Tiles/Name/G", ref _Theme.NameColor.G); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/Tiles/Name/B", ref _Theme.NameColor.B); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/Tiles/Name/A", ref _Theme.NameColor.A); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Tiles/Name/G", ref _Theme.NameColor.G); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Tiles/Name/B", ref _Theme.NameColor.B); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Tiles/Name/A", ref _Theme.NameColor.A); } } diff --git a/VocaluxeLib/Menu/CParticle.cs b/VocaluxeLib/Menu/CParticle.cs index 38faf873..17f590fe 100644 --- a/VocaluxeLib/Menu/CParticle.cs +++ b/VocaluxeLib/Menu/CParticle.cs @@ -380,34 +380,34 @@ namespace Vocaluxe.Menu Visible = true; } - public bool LoadTheme(string XmlPath, string ElementName, CXMLReader xPathHelper, int SkinIndex) + public bool LoadTheme(string XmlPath, string ElementName, CXMLReader xmlReader, int SkinIndex) { string item = XmlPath + "/" + ElementName; _ThemeLoaded = true; - _ThemeLoaded &= xPathHelper.GetValue(item + "/Skin", ref _Theme.TextureName, String.Empty); + _ThemeLoaded &= xmlReader.GetValue(item + "/Skin", ref _Theme.TextureName, String.Empty); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/X", ref Rect.X); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/Y", ref Rect.Y); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/Z", ref Rect.Z); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/W", ref Rect.W); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/H", ref Rect.H); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/X", ref Rect.X); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Y", ref Rect.Y); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Z", ref Rect.Z); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/W", ref Rect.W); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/H", ref Rect.H); - if (xPathHelper.GetValue(item + "/Color", ref _Theme.ColorName, String.Empty)) + if (xmlReader.GetValue(item + "/Color", ref _Theme.ColorName, String.Empty)) { _ThemeLoaded &= _Base.Theme.GetColor(_Theme.ColorName, SkinIndex, ref Color); } else { - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/R", ref Color.R); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/G", ref Color.G); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/B", ref Color.B); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/A", ref Color.A); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/R", ref Color.R); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/G", ref Color.G); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/B", ref Color.B); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/A", ref Color.A); } - _ThemeLoaded &= xPathHelper.TryGetEnumValue(item + "/Type", ref _Type); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/Size", ref _Size); - _ThemeLoaded &= xPathHelper.TryGetIntValue(item + "/MaxNumber", ref _MaxNumber); + _ThemeLoaded &= xmlReader.TryGetEnumValue(item + "/Type", ref _Type); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Size", ref _Size); + _ThemeLoaded &= xmlReader.TryGetIntValue(item + "/MaxNumber", ref _MaxNumber); if (_ThemeLoaded) { diff --git a/VocaluxeLib/Menu/CPlaylist.cs b/VocaluxeLib/Menu/CPlaylist.cs index 5d073eef..6817954b 100644 --- a/VocaluxeLib/Menu/CPlaylist.cs +++ b/VocaluxeLib/Menu/CPlaylist.cs @@ -235,57 +235,57 @@ namespace Vocaluxe.Menu _Interactions.AddButton(_Theme.ButtonPlaylistSing); } - public bool LoadTheme(string XmlPath, string ElementName, CXMLReader xPathHelper, int SkinIndex) + public bool LoadTheme(string XmlPath, string ElementName, CXMLReader xmlReader, int SkinIndex) { string item = XmlPath + "/" + ElementName; _ThemeLoaded = true; - _ThemeLoaded &= xPathHelper.GetValue(item + "/SkinBackground", ref _Theme.TextureBackgroundName, String.Empty); - _ThemeLoaded &= xPathHelper.GetValue(item + "/SkinBackgroundSelected", ref _Theme.STextureBackgroundName, String.Empty); + _ThemeLoaded &= xmlReader.GetValue(item + "/SkinBackground", ref _Theme.TextureBackgroundName, String.Empty); + _ThemeLoaded &= xmlReader.GetValue(item + "/SkinBackgroundSelected", ref _Theme.STextureBackgroundName, String.Empty); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/X", ref Rect.X); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/Y", ref Rect.Y); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/Z", ref Rect.Z); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/W", ref Rect.W); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/H", ref Rect.H); - if (xPathHelper.GetValue(item + "/ColorBackground", ref _Theme.ColorBackgroundName, String.Empty)) + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/X", ref Rect.X); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Y", ref Rect.Y); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Z", ref Rect.Z); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/W", ref Rect.W); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/H", ref Rect.H); + if (xmlReader.GetValue(item + "/ColorBackground", ref _Theme.ColorBackgroundName, String.Empty)) { _ThemeLoaded &= _Base.Theme.GetColor(_Theme.ColorBackgroundName, SkinIndex, ref BackgroundColor); } else { - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/BackgroundR", ref BackgroundColor.R); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/BackgroundG", ref BackgroundColor.G); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/BackgroundB", ref BackgroundColor.B); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/BackgroundA", ref BackgroundColor.A); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/BackgroundR", ref BackgroundColor.R); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/BackgroundG", ref BackgroundColor.G); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/BackgroundB", ref BackgroundColor.B); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/BackgroundA", ref BackgroundColor.A); } - if (xPathHelper.GetValue(item + "/SColorBackground", ref _Theme.SColorBackgroundName, String.Empty)) + if (xmlReader.GetValue(item + "/SColorBackground", ref _Theme.SColorBackgroundName, String.Empty)) { _ThemeLoaded &= _Base.Theme.GetColor(_Theme.SColorBackgroundName, SkinIndex, ref BackgroundSColor); } else { - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/SBackgroundR", ref BackgroundSColor.R); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/SBackgroundG", ref BackgroundSColor.G); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/SBackgroundB", ref BackgroundSColor.B); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/SBackgroundA", ref BackgroundSColor.A); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/SBackgroundR", ref BackgroundSColor.R); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/SBackgroundG", ref BackgroundSColor.G); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/SBackgroundB", ref BackgroundSColor.B); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/SBackgroundA", ref BackgroundSColor.A); } - _ThemeLoaded &= _Theme.Text1.LoadTheme(item, "TextPart1", xPathHelper, SkinIndex); + _ThemeLoaded &= _Theme.Text1.LoadTheme(item, "TextPart1", xmlReader, SkinIndex); - _ThemeLoaded &= _Theme.StaticCover.LoadTheme(item, "StaticCover", xPathHelper, SkinIndex); - _ThemeLoaded &= _Theme.StaticPlaylistHeader.LoadTheme(item, "StaticPlaylistHeader", xPathHelper, SkinIndex); - _ThemeLoaded &= _Theme.StaticPlaylistFooter.LoadTheme(item, "StaticPlaylistFooter", xPathHelper, SkinIndex); + _ThemeLoaded &= _Theme.StaticCover.LoadTheme(item, "StaticCover", xmlReader, SkinIndex); + _ThemeLoaded &= _Theme.StaticPlaylistHeader.LoadTheme(item, "StaticPlaylistHeader", xmlReader, SkinIndex); + _ThemeLoaded &= _Theme.StaticPlaylistFooter.LoadTheme(item, "StaticPlaylistFooter", xmlReader, SkinIndex); - _ThemeLoaded &= _Theme.ButtonPlaylistName.LoadTheme(item, "ButtonPlaylistName", xPathHelper, SkinIndex); - _ThemeLoaded &= _Theme.ButtonPlaylistSing.LoadTheme(item, "ButtonPlaylistSing", xPathHelper, SkinIndex); - _ThemeLoaded &= _Theme.ButtonPlaylistClose.LoadTheme(item, "ButtonPlaylistClose", xPathHelper, SkinIndex); - _ThemeLoaded &= _Theme.ButtonPlaylistSave.LoadTheme(item, "ButtonPlaylistSave", xPathHelper, SkinIndex); - _ThemeLoaded &= _Theme.ButtonPlaylistDelete.LoadTheme(item, "ButtonPlaylistDelete", xPathHelper, SkinIndex); + _ThemeLoaded &= _Theme.ButtonPlaylistName.LoadTheme(item, "ButtonPlaylistName", xmlReader, SkinIndex); + _ThemeLoaded &= _Theme.ButtonPlaylistSing.LoadTheme(item, "ButtonPlaylistSing", xmlReader, SkinIndex); + _ThemeLoaded &= _Theme.ButtonPlaylistClose.LoadTheme(item, "ButtonPlaylistClose", xmlReader, SkinIndex); + _ThemeLoaded &= _Theme.ButtonPlaylistSave.LoadTheme(item, "ButtonPlaylistSave", xmlReader, SkinIndex); + _ThemeLoaded &= _Theme.ButtonPlaylistDelete.LoadTheme(item, "ButtonPlaylistDelete", xmlReader, SkinIndex); - _ThemeLoaded &= _Theme.SelectSlideGameMode.LoadTheme(item, "SelectSlideGameMode", xPathHelper, SkinIndex); + _ThemeLoaded &= _Theme.SelectSlideGameMode.LoadTheme(item, "SelectSlideGameMode", xmlReader, SkinIndex); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/EntryHeight", ref _Theme.EntryHeight); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/EntryHeight", ref _Theme.EntryHeight); if (_ThemeLoaded) { _Theme.Name = ElementName; diff --git a/VocaluxeLib/Menu/CScreenSetting.cs b/VocaluxeLib/Menu/CScreenSetting.cs index 1f855ed2..fcbe80b7 100644 --- a/VocaluxeLib/Menu/CScreenSetting.cs +++ b/VocaluxeLib/Menu/CScreenSetting.cs @@ -50,13 +50,13 @@ namespace Vocaluxe.Menu _ThemeLoaded = ts._ThemeLoaded; } - public bool LoadTheme(string XmlPath, string ElementName, CXMLReader xPathHelper, int SkinIndex) + public bool LoadTheme(string XmlPath, string ElementName, CXMLReader xmlReader, int SkinIndex) { string item = XmlPath + "/" + ElementName; _ThemeLoaded = true; - _ThemeLoaded &= xPathHelper.GetValue(item + "/Value", ref _Theme.Value, String.Empty); - _ThemeLoaded &= xPathHelper.TryGetEnumValue(item + "/Type", ref _Theme.Type); + _ThemeLoaded &= xmlReader.GetValue(item + "/Value", ref _Theme.Value, String.Empty); + _ThemeLoaded &= xmlReader.TryGetEnumValue(item + "/Type", ref _Theme.Type); if (_ThemeLoaded) { diff --git a/VocaluxeLib/Menu/CSelectSlide.cs b/VocaluxeLib/Menu/CSelectSlide.cs index 8855f402..684386ae 100644 --- a/VocaluxeLib/Menu/CSelectSlide.cs +++ b/VocaluxeLib/Menu/CSelectSlide.cs @@ -229,133 +229,133 @@ namespace Vocaluxe.Menu Visible = slide.Visible; } - public bool LoadTheme(string XmlPath, string ElementName, CXMLReader xPathHelper, int SkinIndex) + public bool LoadTheme(string XmlPath, string ElementName, CXMLReader xmlReader, int SkinIndex) { string item = XmlPath + "/" + ElementName; _ThemeLoaded = true; - _ThemeLoaded &= xPathHelper.GetValue(item + "/Skin", ref _Theme.TextureName, String.Empty); - _ThemeLoaded &= xPathHelper.GetValue(item + "/SkinArrowLeft", ref _Theme.TextureArrowLeftName, String.Empty); - _ThemeLoaded &= xPathHelper.GetValue(item + "/SkinArrowRight", ref _Theme.TextureArrowRightName, String.Empty); + _ThemeLoaded &= xmlReader.GetValue(item + "/Skin", ref _Theme.TextureName, String.Empty); + _ThemeLoaded &= xmlReader.GetValue(item + "/SkinArrowLeft", ref _Theme.TextureArrowLeftName, String.Empty); + _ThemeLoaded &= xmlReader.GetValue(item + "/SkinArrowRight", ref _Theme.TextureArrowRightName, String.Empty); - _ThemeLoaded &= xPathHelper.GetValue(item + "/SkinSelected", ref _Theme.STextureName, String.Empty); - _ThemeLoaded &= xPathHelper.GetValue(item + "/SkinArrowLeftSelected", ref _Theme.STextureArrowLeftName, String.Empty); - _ThemeLoaded &= xPathHelper.GetValue(item + "/SkinArrowRightSelected", ref _Theme.STextureArrowRightName, String.Empty); + _ThemeLoaded &= xmlReader.GetValue(item + "/SkinSelected", ref _Theme.STextureName, String.Empty); + _ThemeLoaded &= xmlReader.GetValue(item + "/SkinArrowLeftSelected", ref _Theme.STextureArrowLeftName, String.Empty); + _ThemeLoaded &= xmlReader.GetValue(item + "/SkinArrowRightSelected", ref _Theme.STextureArrowRightName, String.Empty); - _ThemeLoaded &= xPathHelper.GetValue(item + "/SkinHighlighted", ref _Theme.HTextureName, String.Empty); + _ThemeLoaded &= xmlReader.GetValue(item + "/SkinHighlighted", ref _Theme.HTextureName, String.Empty); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/X", ref Rect.X); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/Y", ref Rect.Y); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/Z", ref Rect.Z); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/W", ref Rect.W); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/H", ref Rect.H); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/X", ref Rect.X); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Y", ref Rect.Y); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Z", ref Rect.Z); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/W", ref Rect.W); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/H", ref Rect.H); - if (xPathHelper.GetValue(item + "/Color", ref _Theme.ColorName, String.Empty)) + if (xmlReader.GetValue(item + "/Color", ref _Theme.ColorName, String.Empty)) { _ThemeLoaded &= _Base.Theme.GetColor(_Theme.ColorName, SkinIndex, ref Color); } else { - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/R", ref Color.R); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/G", ref Color.G); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/B", ref Color.B); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/A", ref Color.A); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/R", ref Color.R); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/G", ref Color.G); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/B", ref Color.B); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/A", ref Color.A); } - if (xPathHelper.GetValue(item + "/SColor", ref _Theme.SColorName, String.Empty)) + if (xmlReader.GetValue(item + "/SColor", ref _Theme.SColorName, String.Empty)) { _ThemeLoaded &= _Base.Theme.GetColor(_Theme.SColorName, SkinIndex, ref SColor); } else { - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/SR", ref SColor.R); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/SG", ref SColor.G); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/SB", ref SColor.B); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/SA", ref SColor.A); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/SR", ref SColor.R); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/SG", ref SColor.G); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/SB", ref SColor.B); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/SA", ref SColor.A); } - if (xPathHelper.GetValue(item + "/HColor", ref _Theme.HColorName, String.Empty)) + if (xmlReader.GetValue(item + "/HColor", ref _Theme.HColorName, String.Empty)) { _ThemeLoaded &= _Base.Theme.GetColor(_Theme.HColorName, SkinIndex, ref HColor); } else { - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/HR", ref HColor.R); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/HG", ref HColor.G); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/HB", ref HColor.B); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/HA", ref HColor.A); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/HR", ref HColor.R); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/HG", ref HColor.G); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/HB", ref HColor.B); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/HA", ref HColor.A); } - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/ArrowLeftX", ref RectArrowLeft.X); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/ArrowLeftY", ref RectArrowLeft.Y); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/ArrowLeftZ", ref RectArrowLeft.Z); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/ArrowLeftW", ref RectArrowLeft.W); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/ArrowLeftH", ref RectArrowLeft.H); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/ArrowLeftX", ref RectArrowLeft.X); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/ArrowLeftY", ref RectArrowLeft.Y); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/ArrowLeftZ", ref RectArrowLeft.Z); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/ArrowLeftW", ref RectArrowLeft.W); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/ArrowLeftH", ref RectArrowLeft.H); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/ArrowRightX", ref RectArrowRight.X); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/ArrowRightY", ref RectArrowRight.Y); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/ArrowRightZ", ref RectArrowRight.Z); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/ArrowRightW", ref RectArrowRight.W); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/ArrowRightH", ref RectArrowRight.H); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/ArrowRightX", ref RectArrowRight.X); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/ArrowRightY", ref RectArrowRight.Y); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/ArrowRightZ", ref RectArrowRight.Z); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/ArrowRightW", ref RectArrowRight.W); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/ArrowRightH", ref RectArrowRight.H); - if (xPathHelper.GetValue(item + "/ArrowColor", ref _Theme.ArrowColorName, String.Empty)) + if (xmlReader.GetValue(item + "/ArrowColor", ref _Theme.ArrowColorName, String.Empty)) { _ThemeLoaded &= _Base.Theme.GetColor(_Theme.ArrowColorName, SkinIndex, ref ColorArrow); } else { - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/ArrowR", ref ColorArrow.R); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/ArrowG", ref ColorArrow.G); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/ArrowB", ref ColorArrow.B); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/ArrowA", ref ColorArrow.A); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/ArrowR", ref ColorArrow.R); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/ArrowG", ref ColorArrow.G); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/ArrowB", ref ColorArrow.B); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/ArrowA", ref ColorArrow.A); } - if (xPathHelper.GetValue(item + "/ArrowSColor", ref _Theme.SArrowColorName, String.Empty)) + if (xmlReader.GetValue(item + "/ArrowSColor", ref _Theme.SArrowColorName, String.Empty)) { _ThemeLoaded &= _Base.Theme.GetColor(_Theme.SArrowColorName, SkinIndex, ref SColorArrow); } else { - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/ArrowSR", ref SColorArrow.R); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/ArrowSG", ref SColorArrow.G); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/ArrowSB", ref SColorArrow.B); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/ArrowSA", ref SColorArrow.A); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/ArrowSR", ref SColorArrow.R); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/ArrowSG", ref SColorArrow.G); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/ArrowSB", ref SColorArrow.B); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/ArrowSA", ref SColorArrow.A); } - if (xPathHelper.GetValue(item + "/TextColor", ref _Theme.TextColorName, String.Empty)) + if (xmlReader.GetValue(item + "/TextColor", ref _Theme.TextColorName, String.Empty)) { _ThemeLoaded &= _Base.Theme.GetColor(_Theme.TextColorName, SkinIndex, ref TextColor); } else { - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/TextR", ref TextColor.R); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/TextG", ref TextColor.G); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/TextB", ref TextColor.B); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/TextA", ref TextColor.A); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/TextR", ref TextColor.R); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/TextG", ref TextColor.G); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/TextB", ref TextColor.B); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/TextA", ref TextColor.A); } - if (xPathHelper.GetValue(item + "/TextSColor", ref _Theme.STextColorName, String.Empty)) + if (xmlReader.GetValue(item + "/TextSColor", ref _Theme.STextColorName, String.Empty)) { _ThemeLoaded &= _Base.Theme.GetColor(_Theme.STextColorName, SkinIndex, ref STextColor); } else { - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/TextSR", ref STextColor.R); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/TextSG", ref STextColor.G); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/TextSB", ref STextColor.B); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/TextSA", ref STextColor.A); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/TextSR", ref STextColor.R); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/TextSG", ref STextColor.G); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/TextSB", ref STextColor.B); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/TextSA", ref STextColor.A); } - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/TextH", ref TextH); - if(xPathHelper.TryGetFloatValue(item + "/TextRelativeX", ref TextRelativeX)) - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/TextRelativeX", ref TextRelativeX); - if(xPathHelper.TryGetFloatValue(item + "/TextRelativeY", ref TextRelativeY)) - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/TextRelativeY", ref TextRelativeY); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/TextMaxW", ref MaxW); - _ThemeLoaded &= xPathHelper.GetValue(item + "/TextFont", ref _Theme.TextFont, "Normal"); - _ThemeLoaded &= xPathHelper.TryGetEnumValue(item + "/TextStyle", ref _Theme.TextStyle); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/TextH", ref TextH); + if(xmlReader.TryGetFloatValue(item + "/TextRelativeX", ref TextRelativeX)) + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/TextRelativeX", ref TextRelativeX); + if(xmlReader.TryGetFloatValue(item + "/TextRelativeY", ref TextRelativeY)) + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/TextRelativeY", ref TextRelativeY); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/TextMaxW", ref MaxW); + _ThemeLoaded &= xmlReader.GetValue(item + "/TextFont", ref _Theme.TextFont, "Normal"); + _ThemeLoaded &= xmlReader.TryGetEnumValue(item + "/TextStyle", ref _Theme.TextStyle); - _ThemeLoaded &= xPathHelper.TryGetIntValue(item + "/NumVisible", ref _NumVisible); + _ThemeLoaded &= xmlReader.TryGetIntValue(item + "/NumVisible", ref _NumVisible); if (_ThemeLoaded) { diff --git a/VocaluxeLib/Menu/CStatic.cs b/VocaluxeLib/Menu/CStatic.cs index 7794a883..fd26867e 100644 --- a/VocaluxeLib/Menu/CStatic.cs +++ b/VocaluxeLib/Menu/CStatic.cs @@ -131,36 +131,36 @@ namespace Vocaluxe.Menu Visible = true; } - public bool LoadTheme(string XmlPath, string ElementName, CXMLReader xPathHelper, int SkinIndex) + public bool LoadTheme(string XmlPath, string ElementName, CXMLReader xmlReader, int SkinIndex) { string item = XmlPath + "/" + ElementName; _ThemeLoaded = true; - _ThemeLoaded &= xPathHelper.GetValue(item + "/Skin", ref _Theme.TextureName, String.Empty); + _ThemeLoaded &= xmlReader.GetValue(item + "/Skin", ref _Theme.TextureName, String.Empty); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/X", ref Rect.X); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/Y", ref Rect.Y); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/Z", ref Rect.Z); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/W", ref Rect.W); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/H", ref Rect.H); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/X", ref Rect.X); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Y", ref Rect.Y); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Z", ref Rect.Z); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/W", ref Rect.W); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/H", ref Rect.H); - if (xPathHelper.GetValue(item + "/Color", ref _Theme.ColorName, String.Empty)) + if (xmlReader.GetValue(item + "/Color", ref _Theme.ColorName, String.Empty)) { _ThemeLoaded &= _Base.Theme.GetColor(_Theme.ColorName, SkinIndex, ref Color); } else { - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/R", ref Color.R); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/G", ref Color.G); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/B", ref Color.B); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/A", ref Color.A); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/R", ref Color.R); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/G", ref Color.G); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/B", ref Color.B); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/A", ref Color.A); } - if (xPathHelper.ItemExists(item + "/Reflection")) + if (xmlReader.ItemExists(item + "/Reflection")) { Reflection = true; - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/Reflection/Space", ref ReflectionSpace); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/Reflection/Height", ref ReflectionHeight); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Reflection/Space", ref ReflectionSpace); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Reflection/Height", ref ReflectionHeight); } else Reflection = false; diff --git a/VocaluxeLib/Menu/CText.cs b/VocaluxeLib/Menu/CText.cs index a2131707..a173d228 100644 --- a/VocaluxeLib/Menu/CText.cs +++ b/VocaluxeLib/Menu/CText.cs @@ -470,63 +470,63 @@ namespace Vocaluxe.Menu Reflection = false; } - public bool LoadTheme(string XmlPath, string ElementName, CXMLReader xPathHelper, int SkinIndex) + public bool LoadTheme(string XmlPath, string ElementName, CXMLReader xmlReader, int SkinIndex) { - return LoadTheme(XmlPath, ElementName, xPathHelper, SkinIndex, false); + return LoadTheme(XmlPath, ElementName, xmlReader, SkinIndex, false); } - public bool LoadTheme(string XmlPath, string ElementName, CXMLReader xPathHelper, int SkinIndex, bool ButtonText) + public bool LoadTheme(string XmlPath, string ElementName, CXMLReader xmlReader, int SkinIndex, bool ButtonText) { string item = XmlPath + "/" + ElementName; _ThemeLoaded = true; - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/X", ref _X); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/Y", ref _Y); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/X", ref _X); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Y", ref _Y); if (!ButtonText) - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/Z", ref _Z); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Z", ref _Z); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/H", ref _Height); - xPathHelper.TryGetFloatValue(item + "/MaxW", ref _MaxWidth); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/H", ref _Height); + xmlReader.TryGetFloatValue(item + "/MaxW", ref _MaxWidth); - if (xPathHelper.GetValue(item + "/Color", ref _Theme.ColorName, String.Empty)) + if (xmlReader.GetValue(item + "/Color", ref _Theme.ColorName, String.Empty)) { _ThemeLoaded &= _Base.Theme.GetColor(_Theme.ColorName, SkinIndex, ref Color); } else { - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/R", ref Color.R); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/G", ref Color.G); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/B", ref Color.B); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/A", ref Color.A); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/R", ref Color.R); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/G", ref Color.G); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/B", ref Color.B); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/A", ref Color.A); } - if (xPathHelper.GetValue(item + "/SColor", ref _Theme.SColorName, String.Empty)) + if (xmlReader.GetValue(item + "/SColor", ref _Theme.SColorName, String.Empty)) { _ThemeLoaded &= _Base.Theme.GetColor(_Theme.SColorName, SkinIndex, ref SColor); } else { - if (xPathHelper.TryGetFloatValue(item + "/SR", ref SColor.R)) + if (xmlReader.TryGetFloatValue(item + "/SR", ref SColor.R)) { - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/SG", ref SColor.G); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/SB", ref SColor.B); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/SA", ref SColor.A); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/SG", ref SColor.G); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/SB", ref SColor.B); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/SA", ref SColor.A); } } - _ThemeLoaded &= xPathHelper.TryGetEnumValue(item + "/Align", ref _Align); - xPathHelper.TryGetEnumValue(item + "/HAlign", ref _HAlign); - _ThemeLoaded &= xPathHelper.TryGetEnumValue(item + "/Style", ref _Style); - _ThemeLoaded &= xPathHelper.GetValue(item + "/Font", ref _Fon, "Normal"); + _ThemeLoaded &= xmlReader.TryGetEnumValue(item + "/Align", ref _Align); + xmlReader.TryGetEnumValue(item + "/HAlign", ref _HAlign); + _ThemeLoaded &= xmlReader.TryGetEnumValue(item + "/Style", ref _Style); + _ThemeLoaded &= xmlReader.GetValue(item + "/Font", ref _Fon, "Normal"); - _ThemeLoaded &= xPathHelper.GetValue(item + "/Text", ref _Theme.Text, String.Empty); + _ThemeLoaded &= xmlReader.GetValue(item + "/Text", ref _Theme.Text, String.Empty); - if (xPathHelper.ItemExists(item + "/Reflection") && !ButtonText) + if (xmlReader.ItemExists(item + "/Reflection") && !ButtonText) { Reflection = true; - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/Reflection/Space", ref ReflectionSpace); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/Reflection/Height", ref ReflectionHeight); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Reflection/Space", ref ReflectionSpace); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Reflection/Height", ref ReflectionHeight); } else Reflection = false; diff --git a/VocaluxeLib/Menu/IMenuElement.cs b/VocaluxeLib/Menu/IMenuElement.cs index 7d5d8460..6aae45df 100644 --- a/VocaluxeLib/Menu/IMenuElement.cs +++ b/VocaluxeLib/Menu/IMenuElement.cs @@ -9,7 +9,7 @@ namespace Vocaluxe.Menu { string GetThemeName(); - bool LoadTheme(string XmlPath, string ElementName, CXMLReader xPathHelper, int SkinIndex); + bool LoadTheme(string XmlPath, string ElementName, CXMLReader xmlReader, int SkinIndex); bool SaveTheme(XmlWriter writer); void UnloadTextures(); diff --git a/VocaluxeLib/Menu/SingNotes/CSingNotes.cs b/VocaluxeLib/Menu/SingNotes/CSingNotes.cs index 37a7a666..40992e3d 100644 --- a/VocaluxeLib/Menu/SingNotes/CSingNotes.cs +++ b/VocaluxeLib/Menu/SingNotes/CSingNotes.cs @@ -79,22 +79,22 @@ namespace Vocaluxe.Menu.SingNotes return _Theme.Name; } - public bool LoadTheme(string XmlPath, string ElementName, CXMLReader xPathHelper, int SkinIndex) + public bool LoadTheme(string XmlPath, string ElementName, CXMLReader xmlReader, int SkinIndex) { string item = XmlPath + "/" + ElementName; _ThemeLoaded = true; - _ThemeLoaded &= xPathHelper.GetValue(item + "/SkinLeft", ref _Theme.SkinLeftName, String.Empty); - _ThemeLoaded &= xPathHelper.GetValue(item + "/SkinMiddle", ref _Theme.SkinMiddleName, String.Empty); - _ThemeLoaded &= xPathHelper.GetValue(item + "/SkinRight", ref _Theme.SkinRightName, String.Empty); + _ThemeLoaded &= xmlReader.GetValue(item + "/SkinLeft", ref _Theme.SkinLeftName, String.Empty); + _ThemeLoaded &= xmlReader.GetValue(item + "/SkinMiddle", ref _Theme.SkinMiddleName, String.Empty); + _ThemeLoaded &= xmlReader.GetValue(item + "/SkinRight", ref _Theme.SkinRightName, String.Empty); - _ThemeLoaded &= xPathHelper.GetValue(item + "/SkinBackgroundLeft", ref _Theme.SkinBackgroundLeftName, String.Empty); - _ThemeLoaded &= xPathHelper.GetValue(item + "/SkinBackgroundMiddle", ref _Theme.SkinBackgroundMiddleName, String.Empty); - _ThemeLoaded &= xPathHelper.GetValue(item + "/SkinBackgroundRight", ref _Theme.SkinBackgroundRightName, String.Empty); + _ThemeLoaded &= xmlReader.GetValue(item + "/SkinBackgroundLeft", ref _Theme.SkinBackgroundLeftName, String.Empty); + _ThemeLoaded &= xmlReader.GetValue(item + "/SkinBackgroundMiddle", ref _Theme.SkinBackgroundMiddleName, String.Empty); + _ThemeLoaded &= xmlReader.GetValue(item + "/SkinBackgroundRight", ref _Theme.SkinBackgroundRightName, String.Empty); - _ThemeLoaded &= xPathHelper.GetValue(item + "/SkinGoldenStar", ref _Theme.SkinGoldenStarName, String.Empty); - _ThemeLoaded &= xPathHelper.GetValue(item + "/SkinToneHelper", ref _Theme.SkinToneHelperName, String.Empty); - _ThemeLoaded &= xPathHelper.GetValue(item + "/SkinPerfectNoteStar", ref _Theme.SkinPerfectNoteStarName, String.Empty); + _ThemeLoaded &= xmlReader.GetValue(item + "/SkinGoldenStar", ref _Theme.SkinGoldenStarName, String.Empty); + _ThemeLoaded &= xmlReader.GetValue(item + "/SkinToneHelper", ref _Theme.SkinToneHelperName, String.Empty); + _ThemeLoaded &= xmlReader.GetValue(item + "/SkinPerfectNoteStar", ref _Theme.SkinPerfectNoteStarName, String.Empty); _BarPos = new SRectF[_Base.Settings.GetMaxNumPlayer(), _Base.Settings.GetMaxNumPlayer()]; for (int numplayer = 0; numplayer < _Base.Settings.GetMaxNumPlayer(); numplayer++) @@ -105,11 +105,11 @@ namespace Vocaluxe.Menu.SingNotes { _BarPos[player, numplayer] = new SRectF(); string target = "/BarPositions/P" + (player + 1).ToString() + "N" + (numplayer + 1).ToString(); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + target + "X", ref _BarPos[player, numplayer].X); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + target + "Y", ref _BarPos[player, numplayer].Y); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + target + "Z", ref _BarPos[player, numplayer].Z); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + target + "W", ref _BarPos[player, numplayer].W); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + target + "H", ref _BarPos[player, numplayer].H); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + target + "X", ref _BarPos[player, numplayer].X); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + target + "Y", ref _BarPos[player, numplayer].Y); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + target + "Z", ref _BarPos[player, numplayer].Z); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + target + "W", ref _BarPos[player, numplayer].W); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + target + "H", ref _BarPos[player, numplayer].H); } } } diff --git a/VocaluxeLib/Menu/SongMenu/CSongMenu.cs b/VocaluxeLib/Menu/SongMenu/CSongMenu.cs index 1a354aa3..bd2a9753 100644 --- a/VocaluxeLib/Menu/SongMenu/CSongMenu.cs +++ b/VocaluxeLib/Menu/SongMenu/CSongMenu.cs @@ -165,9 +165,9 @@ namespace Vocaluxe.Menu.SongMenu return _SongMenu.GetThemeName(); } - public bool LoadTheme(string XmlPath, string ElementName, CXMLReader xPathHelper, int SkinIndex) + public bool LoadTheme(string XmlPath, string ElementName, CXMLReader xmlReader, int SkinIndex) { - return _SongMenu.LoadTheme(XmlPath, ElementName, xPathHelper, SkinIndex); + return _SongMenu.LoadTheme(XmlPath, ElementName, xmlReader, SkinIndex); } public bool SaveTheme(XmlWriter writer) diff --git a/VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs b/VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs index 4c631b87..85f17a83 100644 --- a/VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs +++ b/VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs @@ -258,61 +258,61 @@ namespace Vocaluxe.Menu.SongMenu return _Theme.Name; } - public bool LoadTheme(string XmlPath, string ElementName, CXMLReader xPathHelper, int SkinIndex) + public bool LoadTheme(string XmlPath, string ElementName, CXMLReader xmlReader, int SkinIndex) { string item = XmlPath + "/" + ElementName; _ThemeLoaded = true; - _ThemeLoaded &= xPathHelper.GetValue(item + "/CoverBackground", ref _Theme.CoverBackgroundName, String.Empty); - _ThemeLoaded &= xPathHelper.GetValue(item + "/CoverBigBackground", ref _Theme.CoverBigBackgroundName, String.Empty); - _ThemeLoaded &= xPathHelper.GetValue(item + "/DuetIcon", ref _Theme.DuetIconName, String.Empty); - _ThemeLoaded &= xPathHelper.GetValue(item + "/VideoIcon", ref _Theme.VideoIconName, String.Empty); - _ThemeLoaded &= xPathHelper.GetValue(item + "/MedleyCalcIcon", ref _Theme.MedleyCalcIcon, String.Empty); - _ThemeLoaded &= xPathHelper.GetValue(item + "/MedleyTagIcon", ref _Theme.MedleyTagIcon, String.Empty); + _ThemeLoaded &= xmlReader.GetValue(item + "/CoverBackground", ref _Theme.CoverBackgroundName, String.Empty); + _ThemeLoaded &= xmlReader.GetValue(item + "/CoverBigBackground", ref _Theme.CoverBigBackgroundName, String.Empty); + _ThemeLoaded &= xmlReader.GetValue(item + "/DuetIcon", ref _Theme.DuetIconName, String.Empty); + _ThemeLoaded &= xmlReader.GetValue(item + "/VideoIcon", ref _Theme.VideoIconName, String.Empty); + _ThemeLoaded &= xmlReader.GetValue(item + "/MedleyCalcIcon", ref _Theme.MedleyCalcIcon, String.Empty); + _ThemeLoaded &= xmlReader.GetValue(item + "/MedleyTagIcon", ref _Theme.MedleyTagIcon, String.Empty); - if (xPathHelper.GetValue(item + "/Color", ref _Theme.ColorName, String.Empty)) + if (xmlReader.GetValue(item + "/Color", ref _Theme.ColorName, String.Empty)) { _ThemeLoaded &= _Base.Theme.GetColor(_Theme.ColorName, SkinIndex, ref _Color); } else { - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/R", ref _Color.R); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/G", ref _Color.G); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/B", ref _Color.B); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/A", ref _Color.A); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/R", ref _Color.R); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/G", ref _Color.G); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/B", ref _Color.B); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/A", ref _Color.A); } #region SongMenuTileBoard - _ThemeLoaded &= xPathHelper.TryGetIntValue(item + "/SongMenuTileBoard/NumW", ref _Theme.songMenuTileBoard.numW); - _ThemeLoaded &= xPathHelper.TryGetIntValue(item + "/SongMenuTileBoard/NumH", ref _Theme.songMenuTileBoard.numH); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/SongMenuTileBoard/SpaceW", ref _Theme.songMenuTileBoard.spaceW); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/SongMenuTileBoard/SpaceH", ref _Theme.songMenuTileBoard.spaceH); + _ThemeLoaded &= xmlReader.TryGetIntValue(item + "/SongMenuTileBoard/NumW", ref _Theme.songMenuTileBoard.numW); + _ThemeLoaded &= xmlReader.TryGetIntValue(item + "/SongMenuTileBoard/NumH", ref _Theme.songMenuTileBoard.numH); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/SongMenuTileBoard/SpaceW", ref _Theme.songMenuTileBoard.spaceW); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/SongMenuTileBoard/SpaceH", ref _Theme.songMenuTileBoard.spaceH); - _ThemeLoaded &= xPathHelper.TryGetIntValue(item + "/SongMenuTileBoard/NumWsmall", ref _Theme.songMenuTileBoard.numWsmall); - _ThemeLoaded &= xPathHelper.TryGetIntValue(item + "/SongMenuTileBoard/NumHsmall", ref _Theme.songMenuTileBoard.numHsmall); + _ThemeLoaded &= xmlReader.TryGetIntValue(item + "/SongMenuTileBoard/NumWsmall", ref _Theme.songMenuTileBoard.numWsmall); + _ThemeLoaded &= xmlReader.TryGetIntValue(item + "/SongMenuTileBoard/NumHsmall", ref _Theme.songMenuTileBoard.numHsmall); - _ThemeLoaded &= _Theme.songMenuTileBoard.TextArtist.LoadTheme(item + "/SongMenuTileBoard", "TextArtist", xPathHelper, SkinIndex); - _ThemeLoaded &= _Theme.songMenuTileBoard.TextTitle.LoadTheme(item + "/SongMenuTileBoard", "TextTitle", xPathHelper, SkinIndex); - _ThemeLoaded &= _Theme.songMenuTileBoard.TextSongLength.LoadTheme(item + "/SongMenuTileBoard", "TextSongLength", xPathHelper, SkinIndex); + _ThemeLoaded &= _Theme.songMenuTileBoard.TextArtist.LoadTheme(item + "/SongMenuTileBoard", "TextArtist", xmlReader, SkinIndex); + _ThemeLoaded &= _Theme.songMenuTileBoard.TextTitle.LoadTheme(item + "/SongMenuTileBoard", "TextTitle", xmlReader, SkinIndex); + _ThemeLoaded &= _Theme.songMenuTileBoard.TextSongLength.LoadTheme(item + "/SongMenuTileBoard", "TextSongLength", xmlReader, SkinIndex); - _ThemeLoaded &= _Theme.songMenuTileBoard.StaticCoverBig.LoadTheme(item + "/SongMenuTileBoard", "StaticCoverBig", xPathHelper, SkinIndex); - _ThemeLoaded &= _Theme.songMenuTileBoard.StaticTextBG.LoadTheme(item + "/SongMenuTileBoard", "StaticTextBG", xPathHelper, SkinIndex); - _ThemeLoaded &= _Theme.songMenuTileBoard.StaticDuetIcon.LoadTheme(item + "/SongMenuTileBoard", "StaticDuetIcon", xPathHelper, SkinIndex); - _ThemeLoaded &= _Theme.songMenuTileBoard.StaticVideoIcon.LoadTheme(item + "/SongMenuTileBoard", "StaticVideoIcon", xPathHelper, SkinIndex); - _ThemeLoaded &= _Theme.songMenuTileBoard.StaticMedleyCalcIcon.LoadTheme(item + "/SongMenuTileBoard", "StaticMedleyCalcIcon", xPathHelper, SkinIndex); - _ThemeLoaded &= _Theme.songMenuTileBoard.StaticMedleyTagIcon.LoadTheme(item + "/SongMenuTileBoard", "StaticMedleyTagIcon", xPathHelper, SkinIndex); + _ThemeLoaded &= _Theme.songMenuTileBoard.StaticCoverBig.LoadTheme(item + "/SongMenuTileBoard", "StaticCoverBig", xmlReader, SkinIndex); + _ThemeLoaded &= _Theme.songMenuTileBoard.StaticTextBG.LoadTheme(item + "/SongMenuTileBoard", "StaticTextBG", xmlReader, SkinIndex); + _ThemeLoaded &= _Theme.songMenuTileBoard.StaticDuetIcon.LoadTheme(item + "/SongMenuTileBoard", "StaticDuetIcon", xmlReader, SkinIndex); + _ThemeLoaded &= _Theme.songMenuTileBoard.StaticVideoIcon.LoadTheme(item + "/SongMenuTileBoard", "StaticVideoIcon", xmlReader, SkinIndex); + _ThemeLoaded &= _Theme.songMenuTileBoard.StaticMedleyCalcIcon.LoadTheme(item + "/SongMenuTileBoard", "StaticMedleyCalcIcon", xmlReader, SkinIndex); + _ThemeLoaded &= _Theme.songMenuTileBoard.StaticMedleyTagIcon.LoadTheme(item + "/SongMenuTileBoard", "StaticMedleyTagIcon", xmlReader, SkinIndex); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/SongMenuTileBoard/TileRectX", ref _Theme.songMenuTileBoard.TileRect.X); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/SongMenuTileBoard/TileRectY", ref _Theme.songMenuTileBoard.TileRect.Y); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/SongMenuTileBoard/TileRectZ", ref _Theme.songMenuTileBoard.TileRect.Z); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/SongMenuTileBoard/TileRectW", ref _Theme.songMenuTileBoard.TileRect.W); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/SongMenuTileBoard/TileRectH", ref _Theme.songMenuTileBoard.TileRect.H); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/SongMenuTileBoard/TileRectX", ref _Theme.songMenuTileBoard.TileRect.X); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/SongMenuTileBoard/TileRectY", ref _Theme.songMenuTileBoard.TileRect.Y); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/SongMenuTileBoard/TileRectZ", ref _Theme.songMenuTileBoard.TileRect.Z); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/SongMenuTileBoard/TileRectW", ref _Theme.songMenuTileBoard.TileRect.W); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/SongMenuTileBoard/TileRectH", ref _Theme.songMenuTileBoard.TileRect.H); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/SongMenuTileBoard/TileRectSmallX", ref _Theme.songMenuTileBoard.TileRectSmall.X); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/SongMenuTileBoard/TileRectSmallY", ref _Theme.songMenuTileBoard.TileRectSmall.Y); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/SongMenuTileBoard/TileRectSmallZ", ref _Theme.songMenuTileBoard.TileRectSmall.Z); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/SongMenuTileBoard/TileRectSmallW", ref _Theme.songMenuTileBoard.TileRectSmall.W); - _ThemeLoaded &= xPathHelper.TryGetFloatValue(item + "/SongMenuTileBoard/TileRectSmallH", ref _Theme.songMenuTileBoard.TileRectSmall.H); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/SongMenuTileBoard/TileRectSmallX", ref _Theme.songMenuTileBoard.TileRectSmall.X); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/SongMenuTileBoard/TileRectSmallY", ref _Theme.songMenuTileBoard.TileRectSmall.Y); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/SongMenuTileBoard/TileRectSmallZ", ref _Theme.songMenuTileBoard.TileRectSmall.Z); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/SongMenuTileBoard/TileRectSmallW", ref _Theme.songMenuTileBoard.TileRectSmall.W); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/SongMenuTileBoard/TileRectSmallH", ref _Theme.songMenuTileBoard.TileRectSmall.H); #endregion SongMenuTileBoard