diff --git a/.gitignore b/.gitignore index 5995c110..b02f4019 100644 --- a/.gitignore +++ b/.gitignore @@ -35,3 +35,5 @@ Output/Songs *.nativecodeanalysis* *.lastcodeanalysissucceeded /PartyModes/*/*/*.dll + +*.Cache diff --git a/PartyModes/PartyModeChallenge/GlobalSuppressions.cs b/PartyModes/PartyModeChallenge/GlobalSuppressions.cs index b855fe85..21fb9bcd 100644 Binary files a/PartyModes/PartyModeChallenge/GlobalSuppressions.cs and b/PartyModes/PartyModeChallenge/GlobalSuppressions.cs differ diff --git a/PartyModes/PartyModeChallenge/PartyScreenChallengeMain.cs b/PartyModes/PartyModeChallenge/PartyScreenChallengeMain.cs index abeb796e..f91e76d3 100644 --- a/PartyModes/PartyModeChallenge/PartyScreenChallengeMain.cs +++ b/PartyModes/PartyModeChallenge/PartyScreenChallengeMain.cs @@ -363,7 +363,7 @@ namespace VocaluxeLib.PartyModes.Challenge int pid = GameState.Combs[GameState.CurrentRoundNr - 1].Player[i]; NextPlayerStatics[i].Texture = profiles[GameState.ProfileIDs[pid]].Avatar.Texture; NextPlayerTexts[i].Text = profiles[GameState.ProfileIDs[pid]].PlayerName; - NextPlayerTexts[i].Color = CBase.Theme.GetPlayerColor((i + 1)); + NextPlayerTexts[i].Color = CBase.Theme.GetPlayerColor(i + 1); } } else diff --git a/PartyModes/PartyModeChallenge/PartyScreenChallengeNames.cs b/PartyModes/PartyModeChallenge/PartyScreenChallengeNames.cs index 1f7248d7..b1132546 100644 --- a/PartyModes/PartyModeChallenge/PartyScreenChallengeNames.cs +++ b/PartyModes/PartyModeChallenge/PartyScreenChallengeNames.cs @@ -167,8 +167,8 @@ namespace VocaluxeLib.PartyModes.Challenge if (mouseEvent.LBH && SelectingMouseActive) { //Update coords for Drag/Drop-Texture - chooseAvatarStatic.Rect.X += (mouseEvent.X - OldMouseX); - chooseAvatarStatic.Rect.Y += (mouseEvent.Y - OldMouseY); + chooseAvatarStatic.Rect.X += mouseEvent.X - OldMouseX; + chooseAvatarStatic.Rect.Y += mouseEvent.Y - OldMouseY; OldMouseX = mouseEvent.X; OldMouseY = mouseEvent.Y; } diff --git a/PartyModes/PartyModeChallenge/Settings.StyleCop b/PartyModes/PartyModeChallenge/Settings.StyleCop new file mode 100644 index 00000000..f4a4ea2a --- /dev/null +++ b/PartyModes/PartyModeChallenge/Settings.StyleCop @@ -0,0 +1,809 @@ + + + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + + + \ No newline at end of file diff --git a/PartyModes/PartyModeChallengeMedley/GlobalSuppressions.cs b/PartyModes/PartyModeChallengeMedley/GlobalSuppressions.cs index b855fe85..21fb9bcd 100644 Binary files a/PartyModes/PartyModeChallengeMedley/GlobalSuppressions.cs and b/PartyModes/PartyModeChallengeMedley/GlobalSuppressions.cs differ diff --git a/PartyModes/PartyModeChallengeMedley/PartyScreenChallengeMedleyMain.cs b/PartyModes/PartyModeChallengeMedley/PartyScreenChallengeMedleyMain.cs index eaf35b2e..42f55f68 100644 --- a/PartyModes/PartyModeChallengeMedley/PartyScreenChallengeMedleyMain.cs +++ b/PartyModes/PartyModeChallengeMedley/PartyScreenChallengeMedleyMain.cs @@ -363,7 +363,7 @@ namespace VocaluxeLib.PartyModes.ChallengeMedley int pid = GameState.Combs[GameState.CurrentRoundNr - 1].Player[i]; NextPlayerStatics[i].Texture = profiles[GameState.ProfileIDs[pid]].Avatar.Texture; NextPlayerTexts[i].Text = profiles[GameState.ProfileIDs[pid]].PlayerName; - NextPlayerTexts[i].Color = CBase.Theme.GetPlayerColor((i + 1)); + NextPlayerTexts[i].Color = CBase.Theme.GetPlayerColor(i + 1); } } else diff --git a/PartyModes/PartyModeChallengeMedley/PartyScreenChallengeMedleyNames.cs b/PartyModes/PartyModeChallengeMedley/PartyScreenChallengeMedleyNames.cs index 00127fa5..fa285289 100644 --- a/PartyModes/PartyModeChallengeMedley/PartyScreenChallengeMedleyNames.cs +++ b/PartyModes/PartyModeChallengeMedley/PartyScreenChallengeMedleyNames.cs @@ -167,8 +167,8 @@ namespace VocaluxeLib.PartyModes.ChallengeMedley if (mouseEvent.LBH && SelectingMouseActive) { //Update coords for Drag/Drop-Texture - chooseAvatarStatic.Rect.X += (mouseEvent.X - OldMouseX); - chooseAvatarStatic.Rect.Y += (mouseEvent.Y - OldMouseY); + chooseAvatarStatic.Rect.X += mouseEvent.X - OldMouseX; + chooseAvatarStatic.Rect.Y += mouseEvent.Y - OldMouseY; OldMouseX = mouseEvent.X; OldMouseY = mouseEvent.Y; } diff --git a/PartyModes/PartyModeChallengeMedley/Settings.StyleCop b/PartyModes/PartyModeChallengeMedley/Settings.StyleCop new file mode 100644 index 00000000..72ed49f9 --- /dev/null +++ b/PartyModes/PartyModeChallengeMedley/Settings.StyleCop @@ -0,0 +1,809 @@ + + + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + + + \ No newline at end of file diff --git a/PartyModes/PartyModeTicTacToe/GlobalSuppressions.cs b/PartyModes/PartyModeTicTacToe/GlobalSuppressions.cs index b855fe85..21fb9bcd 100644 Binary files a/PartyModes/PartyModeTicTacToe/GlobalSuppressions.cs and b/PartyModes/PartyModeTicTacToe/GlobalSuppressions.cs differ diff --git a/PartyModes/PartyModeTicTacToe/PartyScreenTicTacToeNames.cs b/PartyModes/PartyModeTicTacToe/PartyScreenTicTacToeNames.cs index 1f39b5ac..d82ea403 100644 --- a/PartyModes/PartyModeTicTacToe/PartyScreenTicTacToeNames.cs +++ b/PartyModes/PartyModeTicTacToe/PartyScreenTicTacToeNames.cs @@ -184,8 +184,8 @@ namespace VocaluxeLib.PartyModes.TicTacToe if (mouseEvent.LBH && SelectingMouseActive) { //Update coords for Drag/Drop-Texture - chooseAvatarStatic.Rect.X += (mouseEvent.X - OldMouseX); - chooseAvatarStatic.Rect.Y += (mouseEvent.Y - OldMouseY); + chooseAvatarStatic.Rect.X += mouseEvent.X - OldMouseX; + chooseAvatarStatic.Rect.Y += mouseEvent.Y - OldMouseY; OldMouseX = mouseEvent.X; OldMouseY = mouseEvent.Y; diff --git a/PartyModes/PartyModeTicTacToe/Settings.StyleCop b/PartyModes/PartyModeTicTacToe/Settings.StyleCop new file mode 100644 index 00000000..72ed49f9 --- /dev/null +++ b/PartyModes/PartyModeTicTacToe/Settings.StyleCop @@ -0,0 +1,809 @@ + + + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + + + \ No newline at end of file diff --git a/Re#Settings.DotSettings b/Re#Settings.DotSettings index b599db9d..c0cf12fa 100644 --- a/Re#Settings.DotSettings +++ b/Re#Settings.DotSettings @@ -1,6 +1,7 @@  - <?xml version="1.0" encoding="utf-16"?><Profile name="Cleanup"><CSArrangeThisQualifier>True</CSArrangeThisQualifier><CSRemoveCodeRedundancies>True</CSRemoveCodeRedundancies><CSMakeFieldReadonly>True</CSMakeFieldReadonly><CSUseVar><BehavourStyle>DISABLED</BehavourStyle><LocalVariableStyle>ALWAYS_EXPLICIT</LocalVariableStyle><ForeachVariableStyle>ALWAYS_EXPLICIT</ForeachVariableStyle></CSUseVar><CSOptimizeUsings><OptimizeUsings>False</OptimizeUsings><EmbraceInRegion>False</EmbraceInRegion><RegionName></RegionName></CSOptimizeUsings><CSReformatCode>True</CSReformatCode><CSharpFormatDocComments>True</CSharpFormatDocComments><CSShortenReferences>True</CSShortenReferences><CSUseAutoProperty>True</CSUseAutoProperty></Profile> + <?xml version="1.0" encoding="utf-16"?><Profile name="Cleanup"><CSArrangeThisQualifier>True</CSArrangeThisQualifier><CSRemoveCodeRedundancies>True</CSRemoveCodeRedundancies><CSMakeFieldReadonly>True</CSMakeFieldReadonly><CSUseVar><BehavourStyle>DISABLED</BehavourStyle><LocalVariableStyle>ALWAYS_EXPLICIT</LocalVariableStyle><ForeachVariableStyle>ALWAYS_EXPLICIT</ForeachVariableStyle></CSUseVar><CSOptimizeUsings><OptimizeUsings>False</OptimizeUsings><EmbraceInRegion>False</EmbraceInRegion><RegionName></RegionName></CSOptimizeUsings><CSReformatCode>True</CSReformatCode><CSharpFormatDocComments>True</CSharpFormatDocComments><CSShortenReferences>True</CSShortenReferences></Profile> Cleanup + Default: Reformat Code 0 0 TOGETHER_SAME_LINE @@ -32,4 +33,5 @@ <Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /> <Policy><Descriptor Staticness="Static, Instance" AccessRightKinds="Private, Protected, ProtectedInternal, Internal, Public" Description="Enums"><ElementKinds><Kind Name="ENUM" /></ElementKinds></Descriptor><Policy Inspect="True" Prefix="E" Suffix="" Style="AaBb" /></Policy> <Policy><Descriptor Staticness="Static, Instance" AccessRightKinds="Private, Protected, ProtectedInternal, Internal, Public" Description="Classes"><ElementKinds><Kind Name="CLASS" /></ElementKinds></Descriptor><Policy Inspect="True" Prefix="C" Suffix="" Style="AaBb" /></Policy> - <Policy><Descriptor Staticness="Static, Instance" AccessRightKinds="Private, Protected, ProtectedInternal, Internal, Public" Description="Structs"><ElementKinds><Kind Name="STRUCT" /></ElementKinds></Descriptor><Policy Inspect="True" Prefix="S" Suffix="" Style="AaBb" /></Policy> \ No newline at end of file + <Policy><Descriptor Staticness="Static, Instance" AccessRightKinds="Private, Protected, ProtectedInternal, Internal, Public" Description="Structs"><ElementKinds><Kind Name="STRUCT" /></ElementKinds></Descriptor><Policy Inspect="True" Prefix="S" Suffix="" Style="AaBb" /></Policy> + \ No newline at end of file diff --git a/Vocaluxe/Base/CBackgroundMusic.cs b/Vocaluxe/Base/CBackgroundMusic.cs index 0b868ee5..3f4f502f 100644 --- a/Vocaluxe/Base/CBackgroundMusic.cs +++ b/Vocaluxe/Base/CBackgroundMusic.cs @@ -225,8 +225,9 @@ namespace Vocaluxe.Base { if (_AllFileNames.Count > 0) { - if (_PreviousMusicIndex == _PreviousFileNames.Count - 1 || _PreviousFileNames.Count == 0) //We are not currently in the previous list + if (_PreviousMusicIndex == _PreviousFileNames.Count - 1 || _PreviousFileNames.Count == 0) { + //We are not currently in the previous list Stop(); if (_NotPlayedFileNames.Count == 0) _NotPlayedFileNames.AddRange(_AllFileNames); @@ -237,8 +238,9 @@ namespace Vocaluxe.Base _PreviousFileNames.Add(_CurrentPlaylistElement); _PreviousMusicIndex = _PreviousFileNames.Count - 1; } - else if (_PreviousFileNames.Count > 0) //We are in the previous list + else if (_PreviousFileNames.Count > 0) { + //We are in the previous list Stop(); _PreviousMusicIndex++; @@ -453,7 +455,7 @@ namespace Vocaluxe.Base float vtime = 0f; CVideo.VdGetFrame(_Video, ref _CurrentVideoTexture, CSound.GetPosition(_CurrentMusicStream), ref vtime); if (_FadeTimer.ElapsedMilliseconds <= 3000L) - _CurrentVideoTexture.color.A = (_FadeTimer.ElapsedMilliseconds / 3000f); + _CurrentVideoTexture.color.A = _FadeTimer.ElapsedMilliseconds / 3000f; else { _CurrentVideoTexture.color.A = 1f; diff --git a/Vocaluxe/Base/CConfig.cs b/Vocaluxe/Base/CConfig.cs index 6bfffb82..ec7a4a33 100644 --- a/Vocaluxe/Base/CConfig.cs +++ b/Vocaluxe/Base/CConfig.cs @@ -124,9 +124,8 @@ namespace Vocaluxe.Base string value = string.Empty; - #region Debug + xmlReader.TryGetEnumValue("//root/Debug/DebugLevel", ref DebugLevel); - #endregion Debug #region Graphics xmlReader.TryGetEnumValue("//root/Graphics/Renderer", ref Renderer); @@ -259,7 +258,7 @@ namespace Vocaluxe.Base writer.WriteStartDocument(); writer.WriteStartElement("root"); - #region Info + writer.WriteStartElement("Info"); writer.WriteElementString("Version", CSettings.GetFullVersionText()); @@ -274,7 +273,6 @@ namespace Vocaluxe.Base writer.WriteElementString("Directory", Environment.CurrentDirectory); writer.WriteEndElement(); - #endregion Info #region Debug writer.WriteStartElement("Debug"); diff --git a/Vocaluxe/Base/CCover.cs b/Vocaluxe/Base/CCover.cs index 52c34c19..9dc14b3b 100644 --- a/Vocaluxe/Base/CCover.cs +++ b/Vocaluxe/Base/CCover.cs @@ -154,7 +154,7 @@ namespace Vocaluxe.Base foreach (string file in files) { - CXMLReader xmlReader = CXMLReader.OpenFile((Path.Combine(path, file))); + CXMLReader xmlReader = CXMLReader.OpenFile(Path.Combine(path, file)); if (xmlReader != null) { @@ -184,7 +184,7 @@ namespace Vocaluxe.Base if (coverTheme.Name.Length > 0) { - CXMLReader xmlReader = CXMLReader.OpenFile((Path.Combine(CSettings.sFolderCover, coverTheme.File))); + CXMLReader xmlReader = CXMLReader.OpenFile(Path.Combine(CSettings.sFolderCover, coverTheme.File)); if (xmlReader != null) { diff --git a/Vocaluxe/Base/CDataBase.cs b/Vocaluxe/Base/CDataBase.cs index 2110fd6a..a06203b4 100644 --- a/Vocaluxe/Base/CDataBase.cs +++ b/Vocaluxe/Base/CDataBase.cs @@ -59,9 +59,9 @@ namespace Vocaluxe.Base player.Points = Score; player.LineNr = LineNr; player.DateTicks = Date; - player.Medley = (Medley == 1); - player.Duet = (Duet == 1); - player.ShortSong = (ShortSong == 1); + player.Medley = Medley == 1; + player.Duet = Duet == 1; + player.ShortSong = ShortSong == 1; player.Difficulty = (EGameDifficulty)Diff; using (SQLiteConnection connection = new SQLiteConnection()) @@ -528,14 +528,16 @@ namespace Vocaluxe.Base if (reader == null) { // create new database/tables - if (version == 1) //Check for USDX 1.1 DB + if (version == 1) { + //Check for USDX 1.1 DB CreateHighscoreDBV1(FilePath); ConvertFrom110(FilePath); UpdateDatabase(1, connection); } - else if (version == 0 && scoresTableExists) //Check for USDX 1.01 or CMD Mod DB + else if (version == 0 && scoresTableExists) { + //Check for USDX 1.01 or CMD Mod DB CreateHighscoreDBV1(FilePath); ConvertFrom101(FilePath); UpdateDatabase(1, connection); @@ -546,14 +548,16 @@ namespace Vocaluxe.Base else if (reader.FieldCount == 0) { // create new database/tables - if (version == 1) //Check for USDX 1.1 DB + if (version == 1) { + //Check for USDX 1.1 DB CreateHighscoreDBV1(FilePath); ConvertFrom110(FilePath); UpdateDatabase(1, connection); } - else if (version == 0 && scoresTableExists) //Check for USDX 1.01 or CMD Mod DB + else if (version == 0 && scoresTableExists) { + //Check for USDX 1.01 or CMD Mod DB CreateHighscoreDBV1(FilePath); ConvertFrom101(FilePath); UpdateDatabase(1, connection); @@ -753,8 +757,9 @@ namespace Vocaluxe.Base command.CommandText = "INSERT INTO Scores (SongID, PlayerName, Score, LineNr, Date, Medley, Duet, Difficulty) SELECT SongID, Player, Score, '0', '0', '0', '0', Difficulty from US_Scores"; } - else // This is a CMD 1.01 DB + else { + // This is a CMD 1.01 DB command.CommandText = "INSERT INTO Scores (SongID, PlayerName, Score, LineNr, Date, Medley, Duet, Difficulty) SELECT SongID, Player, Score, '0', Date, '0', '0', Difficulty from US_Scores"; } @@ -782,7 +787,6 @@ namespace Vocaluxe.Base else { //Sqlite3.sqlite3_step(Stmt); - Encoding UTF8 = Encoding.UTF8; Encoding CP1252 = Encoding.GetEncoding(1252); @@ -821,7 +825,6 @@ namespace Vocaluxe.Base else { //Sqlite3.sqlite3_step(Stmt); - Encoding UTF8 = Encoding.UTF8; Encoding CP1252 = Encoding.GetEncoding(1252); diff --git a/Vocaluxe/Base/CFont.cs b/Vocaluxe/Base/CFont.cs index 3a511cc2..b0403dda 100644 --- a/Vocaluxe/Base/CFont.cs +++ b/Vocaluxe/Base/CFont.cs @@ -89,7 +89,6 @@ namespace Vocaluxe.Base Brushes.White, point); * */ - Texture = CDraw.AddTexture(bmp); //bmp.Save("test.png", ImageFormat.Png); Chr = chr; diff --git a/Vocaluxe/Base/CPlaylists.cs b/Vocaluxe/Base/CPlaylists.cs index 0913e081..9c914e4e 100644 --- a/Vocaluxe/Base/CPlaylists.cs +++ b/Vocaluxe/Base/CPlaylists.cs @@ -123,7 +123,7 @@ namespace Vocaluxe.Base CPlaylistFile pl = new CPlaylistFile(); pl.PlaylistName = "New Playlist"; _Playlists.Add(pl); - return (_Playlists.Count - 1); + return _Playlists.Count - 1; } public static void AddPlaylistSong(int PlaylistID, int SongID) diff --git a/Vocaluxe/Base/CSongs.cs b/Vocaluxe/Base/CSongs.cs index 55924525..1837cb2a 100644 --- a/Vocaluxe/Base/CSongs.cs +++ b/Vocaluxe/Base/CSongs.cs @@ -96,7 +96,7 @@ namespace Vocaluxe.Base _CatIndex = value; for (int i = 0; i < Sorter.SortedSongs.Length; i++) - Sorter.SortedSongs[i].Visible = (Sorter.SortedSongs[i].CatIndex == _CatIndex && !Sorter.SortedSongs[i].PartyHidden); + Sorter.SortedSongs[i].Visible = Sorter.SortedSongs[i].CatIndex == _CatIndex && !Sorter.SortedSongs[i].PartyHidden; } } } @@ -223,7 +223,7 @@ namespace Vocaluxe.Base for (int i = 0; i < Sorter.SortedSongs.Length; i++) { Sorter.SortedSongs[i].PartyHidden = false; - Sorter.SortedSongs[i].Visible = (Sorter.SortedSongs[i].CatIndex == _CatIndex && !Sorter.SortedSongs[i].PartyHidden); + Sorter.SortedSongs[i].Visible = Sorter.SortedSongs[i].CatIndex == _CatIndex && !Sorter.SortedSongs[i].PartyHidden; } } @@ -234,7 +234,7 @@ namespace Vocaluxe.Base if (Sorter.SortedSongs[i].CatIndex == CatIndex) { Sorter.SortedSongs[i].PartyHidden = false; - Sorter.SortedSongs[i].Visible = (Sorter.SortedSongs[i].CatIndex == _CatIndex && !Sorter.SortedSongs[i].PartyHidden); + Sorter.SortedSongs[i].Visible = Sorter.SortedSongs[i].CatIndex == _CatIndex && !Sorter.SortedSongs[i].PartyHidden; } } } diff --git a/Vocaluxe/Base/CSound.cs b/Vocaluxe/Base/CSound.cs index c25f5cfb..aa3c9874 100644 --- a/Vocaluxe/Base/CSound.cs +++ b/Vocaluxe/Base/CSound.cs @@ -423,7 +423,6 @@ namespace Vocaluxe.Base // voice passthrough (send data to playback-device) //if (assigned(fVoiceStream)) then //fVoiceStream.WriteData(Buffer, BufferSize); - lock (_AnalysisBufferLock) { Add(buffer); @@ -490,7 +489,6 @@ namespace Vocaluxe.Base // Note: at the lowest tone (~65Hz) and a buffer-size of 4096 // at 44.1 (or 48kHz) only 6 (or 5) samples are compared, this might be // too few samples -> use a bigger buffer-size - for (int ToneIndex = 0; ToneIndex < _NumHalfTones; ToneIndex++) { double CurFreq = _BaseToneFreq * Math.Pow(HalftoneBase, ToneIndex); @@ -614,7 +612,6 @@ namespace Vocaluxe.Base _SetValue -= 0.000025f; } //Console.WriteLine(diff.ToString()); - return dt; } diff --git a/Vocaluxe/Base/CUtility.cs b/Vocaluxe/Base/CUtility.cs index da8f9034..d9811d94 100644 --- a/Vocaluxe/Base/CUtility.cs +++ b/Vocaluxe/Base/CUtility.cs @@ -127,9 +127,9 @@ namespace Vocaluxe.Base { Keys keys = Control.ModifierKeys; - _ModSHIFT = ((keys & Keys.Shift) == Keys.Shift); - _ModALT = ((keys & Keys.Alt) == Keys.Alt); - _ModCTRL = ((keys & Keys.Control) == Keys.Control); + _ModSHIFT = (keys & Keys.Shift) == Keys.Shift; + _ModALT = (keys & Keys.Alt) == Keys.Alt; + _ModCTRL = (keys & Keys.Control) == Keys.Control; } public void KeyDown(KeyEventArgs e) @@ -252,9 +252,9 @@ namespace Vocaluxe.Base { Keys keys = Control.ModifierKeys; - _ModSHIFT = ((keys & Keys.Shift) == Keys.Shift); - _ModALT = ((keys & Keys.Alt) == Keys.Alt); - _ModCTRL = ((keys & Keys.Control) == Keys.Control); + _ModSHIFT = (keys & Keys.Shift) == Keys.Shift; + _ModALT = (keys & Keys.Alt) == Keys.Alt; + _ModCTRL = (keys & Keys.Control) == Keys.Control; } public void MouseMove(MouseEventArgs e) diff --git a/Vocaluxe/GameModes/CGameMode.cs b/Vocaluxe/GameModes/CGameMode.cs index 4726ff73..e3c5bc48 100644 --- a/Vocaluxe/GameModes/CGameMode.cs +++ b/Vocaluxe/GameModes/CGameMode.cs @@ -148,7 +148,7 @@ namespace Vocaluxe.GameModes public virtual bool IsFinished() { - return (_CurrentSong == _SongQueque.Count || _SongQueque.Count == 0); + return _CurrentSong == _SongQueque.Count || _SongQueque.Count == 0; } public virtual int GetCurrentRoundNr() diff --git a/Vocaluxe/GlobalSuppressions.cs b/Vocaluxe/GlobalSuppressions.cs index 5f370c52..b6e8fd45 100644 --- a/Vocaluxe/GlobalSuppressions.cs +++ b/Vocaluxe/GlobalSuppressions.cs @@ -7,7 +7,6 @@ // rechten Maustaste auf die Meldung in der Fehlerliste, zeigen Sie auf // "Meldung(en) unterdrücken", und klicken Sie auf "In Projektunterdrückungsdatei". // Sie müssen dieser Datei nicht manuell Unterdrückungen hinzufügen. - using System.Diagnostics.CodeAnalysis; [assembly: diff --git a/Vocaluxe/Lib/Draw/CDirect3D.cs b/Vocaluxe/Lib/Draw/CDirect3D.cs index 949b780b..5bed9683 100644 --- a/Vocaluxe/Lib/Draw/CDirect3D.cs +++ b/Vocaluxe/Lib/Draw/CDirect3D.cs @@ -117,7 +117,6 @@ namespace Vocaluxe.Lib.Draw _PresentParameters.MultisampleQuality = 0; //Apply antialiasing and check if antialiasing mode is supported - #region Antialiasing int quality = 1; MultisampleType msType; diff --git a/Vocaluxe/Lib/Draw/COpenGL.cs b/Vocaluxe/Lib/Draw/COpenGL.cs index 29e51047..69178311 100644 --- a/Vocaluxe/Lib/Draw/COpenGL.cs +++ b/Vocaluxe/Lib/Draw/COpenGL.cs @@ -91,7 +91,7 @@ namespace Vocaluxe.Lib.Draw control = new GLControl(); control.MakeCurrent(); - control.VSync = (CConfig.VSync == EOffOn.TR_CONFIG_ON); + control.VSync = CConfig.VSync == EOffOn.TR_CONFIG_ON; Controls.Add(control); @@ -877,7 +877,6 @@ namespace Vocaluxe.Lib.Draw //GL.TexParameter(TextureTarget.Texture2D, TextureParameterName.TextureWrapS, (int)TextureParameterName.ClampToEdge); //GL.TexParameter(TextureTarget.Texture2D, TextureParameterName.TextureWrapT, (int)TextureParameterName.ClampToEdge); - OpenTK.Graphics.OpenGL.GL.TexParameter(OpenTK.Graphics.OpenGL.TextureTarget.Texture2D, OpenTK.Graphics.OpenGL.TextureParameterName.TextureMagFilter, (int)OpenTK.Graphics.OpenGL.TextureMagFilter.Linear); OpenTK.Graphics.OpenGL.GL.TexParameter(OpenTK.Graphics.OpenGL.TextureTarget.Texture2D, OpenTK.Graphics.OpenGL.TextureParameterName.TextureMinFilter, @@ -886,7 +885,6 @@ namespace Vocaluxe.Lib.Draw //GL.TexParameter(TextureTarget.Texture2D, TextureParameterName.TextureMinFilter, (int)TextureMinFilter.LinearMipmapLinear); //GL.GenerateMipmap(GenerateMipmapTarget.Texture2D); //GL.Ext.GenerateMipmap(GenerateMipmapTarget.Texture2D); - OpenTK.Graphics.OpenGL.GL.BindTexture(OpenTK.Graphics.OpenGL.TextureTarget.Texture2D, 0); // Add to Texture List @@ -946,7 +944,6 @@ namespace Vocaluxe.Lib.Draw //GL.TexParameter(TextureTarget.Texture2D, TextureParameterName.TextureWrapS, (int)TextureParameterName.ClampToEdge); //GL.TexParameter(TextureTarget.Texture2D, TextureParameterName.TextureWrapT, (int)TextureParameterName.ClampToEdge); - OpenTK.Graphics.OpenGL.GL.TexParameter(OpenTK.Graphics.OpenGL.TextureTarget.Texture2D, OpenTK.Graphics.OpenGL.TextureParameterName.TextureMagFilter, (int)OpenTK.Graphics.OpenGL.TextureMagFilter.Linear); OpenTK.Graphics.OpenGL.GL.TexParameter(OpenTK.Graphics.OpenGL.TextureTarget.Texture2D, OpenTK.Graphics.OpenGL.TextureParameterName.TextureMinFilter, @@ -955,7 +952,6 @@ namespace Vocaluxe.Lib.Draw //GL.TexParameter(TextureTarget.Texture2D, TextureParameterName.TextureMinFilter, (int)TextureMinFilter.LinearMipmapLinear); //GL.GenerateMipmap(GenerateMipmapTarget.Texture2D); //GL.Ext.GenerateMipmap(GenerateMipmapTarget.Texture2D); - OpenTK.Graphics.OpenGL.GL.BindTexture(OpenTK.Graphics.OpenGL.TextureTarget.Texture2D, 0); // Add to Texture List @@ -1093,7 +1089,6 @@ namespace Vocaluxe.Lib.Draw //GL.TexParameter(TextureTarget.Texture2D, TextureParameterName.TextureWrapS, (int)TextureParameterName.ClampToEdge); //GL.TexParameter(TextureTarget.Texture2D, TextureParameterName.TextureWrapT, (int)TextureParameterName.ClampToEdge); - OpenTK.Graphics.OpenGL.GL.TexParameter(OpenTK.Graphics.OpenGL.TextureTarget.Texture2D, OpenTK.Graphics.OpenGL.TextureParameterName.TextureMagFilter, (int)OpenTK.Graphics.OpenGL.TextureMagFilter.Linear); OpenTK.Graphics.OpenGL.GL.TexParameter(OpenTK.Graphics.OpenGL.TextureTarget.Texture2D, OpenTK.Graphics.OpenGL.TextureParameterName.TextureMinFilter, @@ -1102,7 +1097,6 @@ namespace Vocaluxe.Lib.Draw //GL.TexParameter(TextureTarget.Texture2D, TextureParameterName.TextureMinFilter, (int)TextureMinFilter.LinearMipmapLinear); //GL.GenerateMipmap(GenerateMipmapTarget.Texture2D); //GL.Ext.GenerateMipmap(GenerateMipmapTarget.Texture2D); - OpenTK.Graphics.OpenGL.GL.BindTexture(OpenTK.Graphics.OpenGL.TextureTarget.Texture2D, 0); return true; @@ -1132,7 +1126,7 @@ namespace Vocaluxe.Lib.Draw { lock (MutexTexture) { - if (_Textures.ContainsKey((Texture.index))) + if (_Textures.ContainsKey(Texture.index)) { if (_Textures[Texture.index].ID > 0) { diff --git a/Vocaluxe/Lib/Input/CHIDAPI.cs b/Vocaluxe/Lib/Input/CHIDAPI.cs index 26a818e5..2d8ff017 100644 --- a/Vocaluxe/Lib/Input/CHIDAPI.cs +++ b/Vocaluxe/Lib/Input/CHIDAPI.cs @@ -90,8 +90,9 @@ namespace Vocaluxe.Lib.Input private static extern IntPtr hid_enumerate(ushort VendorID, ushort ProductID); //HIDDeviceInfo - public static IntPtr Enumerate(ushort VendorID, ushort ProductID) //HIDDeviceInfo + public static IntPtr Enumerate(ushort VendorID, ushort ProductID) { + //HIDDeviceInfo return hid_enumerate(VendorID, ProductID); } diff --git a/Vocaluxe/Lib/Input/WiiMote/WiiMoteLib.cs b/Vocaluxe/Lib/Input/WiiMote/WiiMoteLib.cs index a0a91ad8..f91dd505 100644 --- a/Vocaluxe/Lib/Input/WiiMote/WiiMoteLib.cs +++ b/Vocaluxe/Lib/Input/WiiMote/WiiMoteLib.cs @@ -489,7 +489,7 @@ namespace Vocaluxe.Lib.Input.WiiMote } int size = (buff[3] >> 4) + 1; - int offset = (buff[4] << 8 | buff[5]); + int offset = buff[4] << 8 | buff[5]; Array.Copy(buff, 6, _ReadBuff, offset - _Address, size); diff --git a/Vocaluxe/Lib/Sound/CGstreamerAudio.cs b/Vocaluxe/Lib/Sound/CGstreamerAudio.cs index f14a923a..289e1211 100644 --- a/Vocaluxe/Lib/Sound/CGstreamerAudio.cs +++ b/Vocaluxe/Lib/Sound/CGstreamerAudio.cs @@ -7,7 +7,6 @@ namespace Vocaluxe.Lib.Sound class CGstreamerAudio : IPlayback { //static float LastPosition; - #region log public CGstreamerAudioWrapper.LogCallback Log; diff --git a/Vocaluxe/Lib/Sound/COpenALPlay.cs b/Vocaluxe/Lib/Sound/COpenALPlay.cs index 325e513f..26973171 100644 --- a/Vocaluxe/Lib/Sound/COpenALPlay.cs +++ b/Vocaluxe/Lib/Sound/COpenALPlay.cs @@ -584,7 +584,6 @@ namespace Vocaluxe.Lib.Sound _state = 0; //AL.SourceQueueBuffers(_source, _buffers.Length, _buffers); } - catch (Exception) { _Initialized = false; diff --git a/Vocaluxe/Lib/Sound/CPortAudioPlay.cs b/Vocaluxe/Lib/Sound/CPortAudioPlay.cs index 3355559e..f502f557 100644 --- a/Vocaluxe/Lib/Sound/CPortAudioPlay.cs +++ b/Vocaluxe/Lib/Sound/CPortAudioPlay.cs @@ -583,7 +583,6 @@ namespace Vocaluxe.Lib.Sound _paStreamCallback = _PaStreamCallback; } - catch (Exception) { _Initialized = false; diff --git a/Vocaluxe/Lib/Sound/Decoder/CAudioDecoderFFmpeg.cs b/Vocaluxe/Lib/Sound/Decoder/CAudioDecoderFFmpeg.cs index 4495e2df..ba63ece0 100644 --- a/Vocaluxe/Lib/Sound/Decoder/CAudioDecoderFFmpeg.cs +++ b/Vocaluxe/Lib/Sound/Decoder/CAudioDecoderFFmpeg.cs @@ -186,7 +186,6 @@ namespace Vocaluxe.Lib.Sound.Decoder TimeStamp = (float)Decoder.timecode; _CurrentTime = TimeStamp; //Console.WriteLine(_CurrentTime.ToString("#0.000") + " Buffer size: " + Decoder.buffer_size.ToString()); - Buffer = new byte[Decoder.buffer_size]; if (Decoder.buffer_size > 0) diff --git a/Vocaluxe/Lib/Sound/Portaudio/PortAudio.cs b/Vocaluxe/Lib/Sound/Portaudio/PortAudio.cs index 20ed2234..15cd38bf 100644 --- a/Vocaluxe/Lib/Sound/Portaudio/PortAudio.cs +++ b/Vocaluxe/Lib/Sound/Portaudio/PortAudio.cs @@ -19,7 +19,6 @@ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ - using System; using System.Runtime.InteropServices; @@ -30,7 +29,6 @@ namespace PortAudioSharp PortAudio v.19 bindings for .NET */ - public partial class PortAudio { #region **** PORTAUDIO CALLBACKS **** diff --git a/Vocaluxe/Lib/Sound/Portaudio/PortAudioASIO.cs b/Vocaluxe/Lib/Sound/Portaudio/PortAudioASIO.cs index f3270268..ff6ee102 100644 --- a/Vocaluxe/Lib/Sound/Portaudio/PortAudioASIO.cs +++ b/Vocaluxe/Lib/Sound/Portaudio/PortAudioASIO.cs @@ -19,7 +19,6 @@ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ - using System; using System.Runtime.InteropServices; @@ -28,9 +27,6 @@ namespace PortAudioSharp /// PortAudio v.19 bindings for .NET - ASIO bindings public partial class PortAudio { - #region **** PORTAUDIO CALLBACKS **** - #endregion - #region **** PORTAUDIO DATA STRUCTURES **** [StructLayout(LayoutKind.Sequential)] public struct PaAsioStreamInfo @@ -61,17 +57,17 @@ namespace PortAudioSharp #endregion #region **** PORTAUDIO FUNCTIONS **** -// /// Retrieve legal latency settings for the specificed device, in samples. -// /// The global index of the device about which the query is being made. -// /// A pointer to the location which will recieve the minimum latency value. -// /// A pointer to the location which will recieve the maximum latency value. -// /// A pointer to the location which will recieve the preferred latency value. -// /// A pointer to the location which will recieve the granularity. This value -// /// determines which values between minLatency and maxLatency are available. ie the step size, -// /// if granularity is -1 then available latency settings are powers of two. -// /// See ASIOGetBufferSize in the ASIO SDK. -// PaError PaAsio_GetAvailableLatencyValues( PaDeviceIndex device, long *minLatency, long *maxLatency, -// long *preferredLatency, long *granularity ); + // /// Retrieve legal latency settings for the specificed device, in samples. + // /// The global index of the device about which the query is being made. + // /// A pointer to the location which will recieve the minimum latency value. + // /// A pointer to the location which will recieve the maximum latency value. + // /// A pointer to the location which will recieve the preferred latency value. + // /// A pointer to the location which will recieve the granularity. This value + // /// determines which values between minLatency and maxLatency are available. ie the step size, + // /// if granularity is -1 then available latency settings are powers of two. + // /// See ASIOGetBufferSize in the ASIO SDK. + // PaError PaAsio_GetAvailableLatencyValues( PaDeviceIndex device, long *minLatency, long *maxLatency, + // long *preferredLatency, long *granularity ); /// Display the ASIO control panel for the specified device. /// The global index of the device whose control panel is to be displayed. @@ -82,15 +78,15 @@ namespace PortAudioSharp [DllImport("PortAudio.dll")] public static extern PaError PaAsio_ShowControlPanel(int device, IntPtr systemSpecific); -// /// Retrieve a pointer to a string containing the name of the specified input channel. -// /// The string is valid until Pa_Terminate is called. -// /// The string will be no longer than 32 characters including the null terminator. -// PaError PaAsio_GetInputChannelName(PaDeviceIndex device, int channelIndex, const char** channelName ); + // /// Retrieve a pointer to a string containing the name of the specified input channel. + // /// The string is valid until Pa_Terminate is called. + // /// The string will be no longer than 32 characters including the null terminator. + // PaError PaAsio_GetInputChannelName(PaDeviceIndex device, int channelIndex, const char** channelName ); -// /// Retrieve a pointer to a string containing the name of the specified input channel. -// /// The string is valid until Pa_Terminate is called. -// /// The string will be no longer than 32 characters including the null terminator. -// PaError PaAsio_GetOutputChannelName( PaDeviceIndex device, int channelIndex, const char** channelName ); + // /// Retrieve a pointer to a string containing the name of the specified input channel. + // /// The string is valid until Pa_Terminate is called. + // /// The string will be no longer than 32 characters including the null terminator. + // PaError PaAsio_GetOutputChannelName( PaDeviceIndex device, int channelIndex, const char** channelName ); /// Set the sample rate of an open paASIO stream. /// stream diff --git a/Vocaluxe/Lib/Video/Acinerella/CAcinerella.cs b/Vocaluxe/Lib/Video/Acinerella/CAcinerella.cs index c5a74cbc..0080e70a 100644 --- a/Vocaluxe/Lib/Video/Acinerella/CAcinerella.cs +++ b/Vocaluxe/Lib/Video/Acinerella/CAcinerella.cs @@ -220,7 +220,6 @@ namespace Vocaluxe.Lib.Video.Acinerella close_proc: TAc_openclose_callback; proberesult: PAc_proberesult): integer; cdecl; external ac_dll; */ - [DllImport(AcDll, EntryPoint = "ac_open", ExactSpelling = false, CallingConvention = CallingConvention.Cdecl, CharSet = CharSet.Auto)] private static extern Int32 _ac_open( IntPtr PAc_instance, diff --git a/Vocaluxe/Lib/Video/CVideoDecoderFFmpeg.cs b/Vocaluxe/Lib/Video/CVideoDecoderFFmpeg.cs index 9473421a..a6f9728d 100644 --- a/Vocaluxe/Lib/Video/CVideoDecoderFFmpeg.cs +++ b/Vocaluxe/Lib/Video/CVideoDecoderFFmpeg.cs @@ -353,7 +353,6 @@ namespace Vocaluxe.Lib.Video _Finished = false; } //EventDecode.Set(); - return true; } @@ -413,11 +412,10 @@ namespace Vocaluxe.Lib.Video { DoOpen(); //EventDecode.Set(); - while (!_terminated) { - //if (EventDecode.WaitOne(10)) { + //if (EventDecode.WaitOne(10)) lock (MutexSyncSignals) { _Time = _SetTime; diff --git a/Vocaluxe/Properties/AssemblyInfo.cs b/Vocaluxe/Properties/AssemblyInfo.cs index 7c2f042d..8ebe0768 100644 --- a/Vocaluxe/Properties/AssemblyInfo.cs +++ b/Vocaluxe/Properties/AssemblyInfo.cs @@ -4,7 +4,6 @@ using System.Runtime.InteropServices; // Allgemeine Informationen über eine Assembly werden über die folgenden // Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern, // die mit einer Assembly verknüpft sind. - [assembly: AssemblyTitle("Vocaluxe.Properties")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] @@ -17,11 +16,9 @@ using System.Runtime.InteropServices; // Durch Festlegen von ComVisible auf "false" werden die Typen in dieser Assembly unsichtbar // für COM-Komponenten. Wenn Sie auf einen Typ in dieser Assembly von // COM zugreifen müssen, legen Sie das ComVisible-Attribut für diesen Typ auf "true" fest. - [assembly: ComVisible(false)] // Die folgende GUID bestimmt die ID der Typbibliothek, wenn dieses Projekt für COM verfügbar gemacht wird - [assembly: Guid("da631594-f891-4994-9869-c37e626e44f9")] // Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten: @@ -31,6 +28,5 @@ using System.Runtime.InteropServices; // Buildnummer // Revision // - [assembly: AssemblyVersion("0.3.0.0")] [assembly: AssemblyFileVersion("1.0.0.0")] \ No newline at end of file diff --git a/Vocaluxe/Screens/CPopupScreenVolumeControl.cs b/Vocaluxe/Screens/CPopupScreenVolumeControl.cs index d865a621..37e9fffc 100644 --- a/Vocaluxe/Screens/CPopupScreenVolumeControl.cs +++ b/Vocaluxe/Screens/CPopupScreenVolumeControl.cs @@ -121,17 +121,17 @@ namespace Vocaluxe.Screens { case EScreens.ScreenSong: if (CSongs.IsInCategory) - SelectSlides[SelectSlideVolume].Selection = (CConfig.PreviewMusicVolume / 5); + SelectSlides[SelectSlideVolume].Selection = CConfig.PreviewMusicVolume / 5; else - SelectSlides[SelectSlideVolume].Selection = (CConfig.BackgroundMusicVolume / 5); + SelectSlides[SelectSlideVolume].Selection = CConfig.BackgroundMusicVolume / 5; break; case EScreens.ScreenSing: - SelectSlides[SelectSlideVolume].Selection = (CConfig.GameMusicVolume / 5); + SelectSlides[SelectSlideVolume].Selection = CConfig.GameMusicVolume / 5; break; default: - SelectSlides[SelectSlideVolume].Selection = (CConfig.BackgroundMusicVolume / 5); + SelectSlides[SelectSlideVolume].Selection = CConfig.BackgroundMusicVolume / 5; break; } } diff --git a/Vocaluxe/Screens/CScreenCredits.cs b/Vocaluxe/Screens/CScreenCredits.cs index 2d5096b7..f4a647f0 100644 --- a/Vocaluxe/Screens/CScreenCredits.cs +++ b/Vocaluxe/Screens/CScreenCredits.cs @@ -259,17 +259,17 @@ namespace Vocaluxe.Screens public CParticleEffect _GetStarParticles(int NumStars, bool isRed, SRectF Rect, bool BigParticles) { - SColorF partColor = (isRed) ? new SColorF(1, 0, 0, 1) : new SColorF(0.149f, 0.415f, 0.819f, 1); - int partSize = (BigParticles) ? 35 : 25; + SColorF partColor = isRed ? new SColorF(1, 0, 0, 1) : new SColorF(0.149f, 0.415f, 0.819f, 1); + int partSize = BigParticles ? 35 : 25; return GetNewParticleEffect(NumStars, partColor, Rect, _TexPerfectNoteStar, partSize, EParticleType.Star); } private void _AddNewCreditName(STexture Texture, int ParticleOffsetX, int ParticleOffsetY, bool BigParticles) { bool isRight = _CreditNames.Count % 2 == 0; - int partRectSize = (BigParticles) ? 25 : 20; - int partCount = (BigParticles) ? 8 : 6; - STexture TexDot = (isRight) ? _TexRedDot : _TexBlueDot; + int partRectSize = BigParticles ? 25 : 20; + int partCount = BigParticles ? 8 : 6; + STexture TexDot = isRight ? _TexRedDot : _TexBlueDot; CStatic Image = GetNewStatic(Texture, new SColorF(1, 1, 1, 1), new SRectF(-1, -1, 400, 120, -4)); @@ -438,7 +438,7 @@ namespace Vocaluxe.Screens else if (_CreditNames[i].Y <= 360f) { //Fade names out - float alpha = ((360 - _CreditNames[i].Y) / 200); + float alpha = (360 - _CreditNames[i].Y) / 200; //Catch some bad alpha-values if (alpha > 1) alpha = 1; diff --git a/Vocaluxe/Screens/CScreenLoad.cs b/Vocaluxe/Screens/CScreenLoad.cs index 4c9e87b1..7860d604 100644 --- a/Vocaluxe/Screens/CScreenLoad.cs +++ b/Vocaluxe/Screens/CScreenLoad.cs @@ -142,7 +142,7 @@ namespace Vocaluxe.Screens else _timer.Start(); - bool next = (CConfig.CoverLoading != ECoverLoading.TR_CONFIG_COVERLOADING_ATSTART || CSongs.CoverLoaded); + bool next = CConfig.CoverLoading != ECoverLoading.TR_CONFIG_COVERLOADING_ATSTART || CSongs.CoverLoaded; if ((_IntroOutPlayed || _SkipIntro) && next && CSettings.GameState != EGameState.EditTheme && CSongs.SongsLoaded) CSettings.GameState = EGameState.Normal; diff --git a/Vocaluxe/Screens/CScreenMain.cs b/Vocaluxe/Screens/CScreenMain.cs index 9f2c2674..389c42ee 100644 --- a/Vocaluxe/Screens/CScreenMain.cs +++ b/Vocaluxe/Screens/CScreenMain.cs @@ -19,7 +19,6 @@ namespace Vocaluxe.Screens private const string ButtonExit = "ButtonExit"; //CParticleEffect Snowflakes; - public override void Init() { base.Init(); @@ -121,15 +120,14 @@ namespace Vocaluxe.Screens public override bool Draw() { - base.DrawBG(); + this.DrawBG(); //if (Snowflakes == null) // Snowflakes = new CParticleEffect(300, new SColorF(1, 1, 1, 1), new SRectF(0, 0, CSettings.iRenderW, 0, 0.5f), "Snowflake", 25, EParticeType.Snow); //Snowflakes.Update(); //Snowflakes.Draw(); - - base.DrawFG(); + this.DrawFG(); if (CSettings.VersionRevision != ERevision.Release) { diff --git a/Vocaluxe/Screens/CScreenNames.cs b/Vocaluxe/Screens/CScreenNames.cs index 3caf1f46..35d4ad73 100644 --- a/Vocaluxe/Screens/CScreenNames.cs +++ b/Vocaluxe/Screens/CScreenNames.cs @@ -444,8 +444,8 @@ namespace Vocaluxe.Screens if (mouseEvent.LBH && selectingMouseActive) { //Update coords for Drag/Drop-Texture - chooseAvatarStatic.Rect.X += (mouseEvent.X - OldMouseX); - chooseAvatarStatic.Rect.Y += (mouseEvent.Y - OldMouseY); + chooseAvatarStatic.Rect.X += mouseEvent.X - OldMouseX; + chooseAvatarStatic.Rect.Y += mouseEvent.Y - OldMouseY; OldMouseX = mouseEvent.X; OldMouseY = mouseEvent.Y; } @@ -556,8 +556,8 @@ namespace Vocaluxe.Screens { for (int i = 1; i <= CGame.NumPlayer; i++) { - CSound.AnalyzeBuffer((i - 1)); - Equalizers["EqualizerPlayer" + i].Update(CSound.ToneWeigth((i - 1))); + CSound.AnalyzeBuffer(i - 1); + Equalizers["EqualizerPlayer" + i].Update(CSound.ToneWeigth(i - 1)); } return true; } diff --git a/Vocaluxe/Screens/CScreenOptionsRecord.cs b/Vocaluxe/Screens/CScreenOptionsRecord.cs index 96ba9bdd..84678966 100644 --- a/Vocaluxe/Screens/CScreenOptionsRecord.cs +++ b/Vocaluxe/Screens/CScreenOptionsRecord.cs @@ -318,8 +318,8 @@ namespace Vocaluxe.Screens UpdateChannels(); } - SelectSlides[SelectSlideRecordChannel1].Visible = (_devices != null); - SelectSlides[SelectSlideRecordChannel2].Visible = (_devices != null); + SelectSlides[SelectSlideRecordChannel1].Visible = _devices != null; + SelectSlides[SelectSlideRecordChannel2].Visible = _devices != null; Statics[StaticWarning].Visible = false; Texts[TextWarning].Visible = false; @@ -335,7 +335,7 @@ namespace Vocaluxe.Screens } } - SelectSlides[SelectSlideDelay].Selection = (CConfig.MicDelay / 20); + SelectSlides[SelectSlideDelay].Selection = CConfig.MicDelay / 20; _DelayTestRunning = false; _DelaySound = -1; diff --git a/Vocaluxe/Screens/CScreenOptionsVideo.cs b/Vocaluxe/Screens/CScreenOptionsVideo.cs index d3730e32..9a4f12c7 100644 --- a/Vocaluxe/Screens/CScreenOptionsVideo.cs +++ b/Vocaluxe/Screens/CScreenOptionsVideo.cs @@ -188,9 +188,9 @@ namespace Vocaluxe.Screens devices = null; } - SelectSlides[SelectSlideWebcamDevices].Visible = (devices != null && devices.Length > 0); - SelectSlides[SelectSlideWebcamCapabilities].Visible = (devices != null && devices.Length > 0); - Statics[StaticWebcamOutput].Visible = (devices != null && devices.Length > 0); + SelectSlides[SelectSlideWebcamDevices].Visible = devices != null && devices.Length > 0; + SelectSlides[SelectSlideWebcamCapabilities].Visible = devices != null && devices.Length > 0; + Statics[StaticWebcamOutput].Visible = devices != null && devices.Length > 0; } private void SaveConfig() diff --git a/Vocaluxe/Screens/CScreenScore.cs b/Vocaluxe/Screens/CScreenScore.cs index e8575c78..117c09c3 100644 --- a/Vocaluxe/Screens/CScreenScore.cs +++ b/Vocaluxe/Screens/CScreenScore.cs @@ -106,7 +106,7 @@ namespace Vocaluxe.Screens _Round = 1; _Points = CGame.GetPoints(); - SetVisuability(); + SetVisibility(); UpdateRatings(); } @@ -276,7 +276,7 @@ namespace Vocaluxe.Screens } } for (int p = 0; p < player.Length; p++) - player[p].Points = (int)Math.Round((player[p].Points / CGame.NumRounds)); + player[p].Points = (int)Math.Round(player[p].Points / CGame.NumRounds); } for (int p = 0; p < player.Length; p++) @@ -345,7 +345,7 @@ namespace Vocaluxe.Screens timer.Start(); } - private void SetVisuability() + private void SetVisibility() { for (int numplayer = 0; numplayer < CSettings.MaxNumPlayer; numplayer++) { @@ -353,13 +353,13 @@ namespace Vocaluxe.Screens { if (player <= numplayer) { - Texts[TextNames[player, numplayer]].Visible = (numplayer + 1 == CGame.NumPlayer); - Texts[TextScores[player, numplayer]].Visible = (numplayer + 1 == CGame.NumPlayer); - Texts[TextRatings[player, numplayer]].Visible = (numplayer + 1 == CGame.NumPlayer); - Texts[TextDifficulty[player, numplayer]].Visible = (numplayer + 1 == CGame.NumPlayer); - Statics[StaticPointsBar[player, numplayer]].Visible = (numplayer + 1 == CGame.NumPlayer); - Statics[StaticPointsBarBG[player, numplayer]].Visible = (numplayer + 1 == CGame.NumPlayer); - Statics[StaticAvatar[player, numplayer]].Visible = (numplayer + 1 == CGame.NumPlayer); + Texts[TextNames[player, numplayer]].Visible = numplayer + 1 == CGame.NumPlayer; + Texts[TextScores[player, numplayer]].Visible = numplayer + 1 == CGame.NumPlayer; + Texts[TextRatings[player, numplayer]].Visible = numplayer + 1 == CGame.NumPlayer; + Texts[TextDifficulty[player, numplayer]].Visible = numplayer + 1 == CGame.NumPlayer; + Statics[StaticPointsBar[player, numplayer]].Visible = numplayer + 1 == CGame.NumPlayer; + Statics[StaticPointsBarBG[player, numplayer]].Visible = numplayer + 1 == CGame.NumPlayer; + Statics[StaticAvatar[player, numplayer]].Visible = numplayer + 1 == CGame.NumPlayer; Statics[StaticAvatar[player, numplayer]].Texture = new STexture(-1); } diff --git a/Vocaluxe/Screens/CScreenSing.cs b/Vocaluxe/Screens/CScreenSing.cs index 7506b14f..e7ee2ed0 100644 --- a/Vocaluxe/Screens/CScreenSing.cs +++ b/Vocaluxe/Screens/CScreenSing.cs @@ -465,7 +465,7 @@ namespace Vocaluxe.Screens } } - base.DrawBG(); + this.DrawBG(); foreach (CStatic stat in Statics) stat.Draw(); @@ -653,7 +653,6 @@ namespace Vocaluxe.Screens break; */ - _TimerSongText.Stop(); _TimerSongText.Reset(); _TimerDuetText1.Stop(); @@ -908,16 +907,16 @@ namespace Vocaluxe.Screens { if (player <= numplayer) { - Texts[TextScores[player, numplayer]].Visible = (numplayer + 1 == CGame.NumPlayer); - Texts[TextNames[player, numplayer]].Visible = ((numplayer + 1 == CGame.NumPlayer) + Texts[TextScores[player, numplayer]].Visible = numplayer + 1 == CGame.NumPlayer; + Texts[TextNames[player, numplayer]].Visible = (numplayer + 1 == CGame.NumPlayer) && (CConfig.PlayerInfo == EPlayerInfo.TR_CONFIG_PLAYERINFO_BOTH || - CConfig.PlayerInfo == EPlayerInfo.TR_CONFIG_PLAYERINFO_NAME)); - Statics[StaticScores[player, numplayer]].Visible = (numplayer + 1 == CGame.NumPlayer); - Statics[StaticAvatars[player, numplayer]].Visible = ((numplayer + 1 == CGame.NumPlayer) + CConfig.PlayerInfo == EPlayerInfo.TR_CONFIG_PLAYERINFO_NAME); + Statics[StaticScores[player, numplayer]].Visible = numplayer + 1 == CGame.NumPlayer; + Statics[StaticAvatars[player, numplayer]].Visible = (numplayer + 1 == CGame.NumPlayer) && (CConfig.PlayerInfo == EPlayerInfo.TR_CONFIG_PLAYERINFO_BOTH || - CConfig.PlayerInfo == EPlayerInfo.TR_CONFIG_PLAYERINFO_AVATAR)); + CConfig.PlayerInfo == EPlayerInfo.TR_CONFIG_PLAYERINFO_AVATAR); } } } @@ -1328,7 +1327,7 @@ namespace Vocaluxe.Screens new SRectF( stat.Rect.X + stat.Rect.W * ((CGame.GetTimeFromBeats(trect.startBeat, song.BPM) + song.Gap - song.Start) / TotalTime), stat.Rect.Y, - stat.Rect.W * (CGame.GetTimeFromBeats((trect.endBeat - trect.startBeat), song.BPM) / TotalTime), + stat.Rect.W * (CGame.GetTimeFromBeats(trect.endBeat - trect.startBeat, song.BPM) / TotalTime), stat.Rect.H, stat.Rect.Z)); diff --git a/Vocaluxe/Screens/CScreenSong.cs b/Vocaluxe/Screens/CScreenSong.cs index fa340e7a..50b2cc38 100644 --- a/Vocaluxe/Screens/CScreenSong.cs +++ b/Vocaluxe/Screens/CScreenSong.cs @@ -1208,7 +1208,7 @@ namespace Vocaluxe.Screens private void OpenPlaylistAction() { //Open a playlist - if (Playlists[Playlist].ActivePlaylistID != (SelectSlides[SelectSlideOptionsPlaylistOpen].Selection)) + if (Playlists[Playlist].ActivePlaylistID != SelectSlides[SelectSlideOptionsPlaylistOpen].Selection) { Playlists[Playlist].ActivePlaylistID = SelectSlides[SelectSlideOptionsPlaylistOpen].Selection; SetSelectSlidePlaylistToCurrentPlaylist(); diff --git a/Vocaluxe/Settings.StyleCop b/Vocaluxe/Settings.StyleCop new file mode 100644 index 00000000..72ed49f9 --- /dev/null +++ b/Vocaluxe/Settings.StyleCop @@ -0,0 +1,809 @@ + + + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + + + \ No newline at end of file diff --git a/VocaluxeLib/GlobalSuppressions.cs b/VocaluxeLib/GlobalSuppressions.cs index 1f0313e4..f43b3e9e 100644 --- a/VocaluxeLib/GlobalSuppressions.cs +++ b/VocaluxeLib/GlobalSuppressions.cs @@ -2,12 +2,10 @@ // Attribute verwendet, die auf dieses Projekt angewendet werden. // Unterdrückungen auf Projektebene haben entweder kein Ziel oder // erhalten ein spezifisches Ziel mit Namespace-, Typ-, Memberbereich usw. -// // Wenn Sie dieser Datei eine Unterdrückung hinzufügen möchten, klicken Sie mit der // rechten Maustaste auf die Meldung in der Fehlerliste, zeigen Sie auf // "Meldung(en) unterdrücken", und klicken Sie auf "In Projektunterdrückungsdatei". // Sie müssen dieser Datei nicht manuell Unterdrückungen hinzufügen. - using System.Diagnostics.CodeAnalysis; [assembly: diff --git a/VocaluxeLib/Menu/CEqualizer.cs b/VocaluxeLib/Menu/CEqualizer.cs index d4f77ad1..469881d1 100644 --- a/VocaluxeLib/Menu/CEqualizer.cs +++ b/VocaluxeLib/Menu/CEqualizer.cs @@ -204,7 +204,7 @@ namespace VocaluxeLib.Menu { _Bars[i] = 1f - weights[i]; if (_Theme.DrawNegative == EOffOn.TR_CONFIG_OFF && weights[i] < 0) - _Bars[i] = (1f + weights[i]); + _Bars[i] = 1f + weights[i]; } else _Bars[i] = 0f; @@ -225,7 +225,7 @@ namespace VocaluxeLib.Menu if (_Bars == null) return; - float dx = (Rect.W) / _Bars.Length; + float dx = Rect.W / _Bars.Length; int max = _Bars.Length - 1; float maxB = _Bars[max]; for (int i = 0; i < _Bars.Length - 1; i++) diff --git a/VocaluxeLib/Menu/CHelper.cs b/VocaluxeLib/Menu/CHelper.cs index 26bfe188..4578b7d6 100644 --- a/VocaluxeLib/Menu/CHelper.cs +++ b/VocaluxeLib/Menu/CHelper.cs @@ -194,7 +194,7 @@ namespace VocaluxeLib.Menu public static bool IsInBounds(SRectF bounds, int x, int y) { - return ((bounds.X <= x) && (bounds.X + bounds.W >= x) && (bounds.Y <= y) && (bounds.Y + bounds.H >= y)); + return (bounds.X <= x) && (bounds.X + bounds.W >= x) && (bounds.Y <= y) && (bounds.Y + bounds.H >= y); } } diff --git a/VocaluxeLib/Menu/CInteraction.cs b/VocaluxeLib/Menu/CInteraction.cs index e191192e..f628bde5 100644 --- a/VocaluxeLib/Menu/CInteraction.cs +++ b/VocaluxeLib/Menu/CInteraction.cs @@ -35,15 +35,15 @@ { get { - return (_Type == EType.TBackground || - _Type == EType.TNameSelection || - _Type == EType.TText || - _Type == EType.TStatic || - _Type == EType.TSongMenu || - _Type == EType.TLyric || - _Type == EType.TSingNote || - _Type == EType.TEqualizer || - _Type == EType.TPlaylist); + return _Type == EType.TBackground || + _Type == EType.TNameSelection || + _Type == EType.TText || + _Type == EType.TStatic || + _Type == EType.TSongMenu || + _Type == EType.TLyric || + _Type == EType.TSingNote || + _Type == EType.TEqualizer || + _Type == EType.TPlaylist; } } diff --git a/VocaluxeLib/Menu/CMenu.cs b/VocaluxeLib/Menu/CMenu.cs index 923f6aab..ce82ddb3 100644 --- a/VocaluxeLib/Menu/CMenu.cs +++ b/VocaluxeLib/Menu/CMenu.cs @@ -849,7 +849,7 @@ namespace VocaluxeLib.Menu return; - items.Sort(delegate(ZSort s1, ZSort s2) { return (s2.z.CompareTo(s1.z)); }); + items.Sort(delegate(ZSort s1, ZSort s2) { return s2.z.CompareTo(s1.z); }); for (int i = 0; i < items.Count; i++) _DrawInteraction(items[i].ID); diff --git a/VocaluxeLib/Menu/CNameSelection.cs b/VocaluxeLib/Menu/CNameSelection.cs index 0d87d20c..e8c6eaba 100644 --- a/VocaluxeLib/Menu/CNameSelection.cs +++ b/VocaluxeLib/Menu/CNameSelection.cs @@ -91,7 +91,7 @@ namespace VocaluxeLib.Menu PlayerSelector = new CStatic(_PartyModeID); PlayerSelector.Texture = _TextureTileSelected; - PlayerSelector.Rect = new SRectF(0, 0, (_TileW + 6), (_TileH + 6), (Rect.Z - 0.5f)); + PlayerSelector.Rect = new SRectF(0, 0, _TileW + 6, _TileH + 6, Rect.Z - 0.5f); PlayerSelector.Visible = false; UpdateVisibleProfiles(); @@ -317,7 +317,7 @@ namespace VocaluxeLib.Menu _actualSelection = _actualSelection - _Tiles.Count + _NumW; if (_Tiles[_actualSelection].PlayerNr == -1) { - for (int i = (_Tiles.Count - 1); i >= 0; i--) + for (int i = _Tiles.Count - 1; i >= 0; i--) { if (_Tiles[i].PlayerNr != -1) { diff --git a/VocaluxeLib/Menu/CObjectInteractions.cs b/VocaluxeLib/Menu/CObjectInteractions.cs index 4d12c44e..f5011276 100644 --- a/VocaluxeLib/Menu/CObjectInteractions.cs +++ b/VocaluxeLib/Menu/CObjectInteractions.cs @@ -312,7 +312,7 @@ namespace VocaluxeLib.Menu return; - items.Sort(delegate(ZSort s1, ZSort s2) { return (s2.z.CompareTo(s1.z)); }); + items.Sort(delegate(ZSort s1, ZSort s2) { return s2.z.CompareTo(s1.z); }); for (int i = 0; i < items.Count; i++) _DrawInteraction(items[i].ID); diff --git a/VocaluxeLib/Menu/CParticle.cs b/VocaluxeLib/Menu/CParticle.cs index 6217456c..7ffaced0 100644 --- a/VocaluxeLib/Menu/CParticle.cs +++ b/VocaluxeLib/Menu/CParticle.cs @@ -86,7 +86,7 @@ namespace VocaluxeLib.Menu public bool IsAlive { - get { return (_Age < _MaxAge || _MaxAge == 0f); } + get { return _Age < _MaxAge || _MaxAge == 0f; } } #endregion public vars @@ -314,7 +314,7 @@ namespace VocaluxeLib.Menu public bool IsAlive { - get { return (_Stars.Count > 0 || !_SpawnTimer.IsRunning); } + get { return _Stars.Count > 0 || !_SpawnTimer.IsRunning; } } public CParticleEffect(int PartyModeID) diff --git a/VocaluxeLib/Menu/CPlaylist.cs b/VocaluxeLib/Menu/CPlaylist.cs index dc4d75a9..92db3f0c 100644 --- a/VocaluxeLib/Menu/CPlaylist.cs +++ b/VocaluxeLib/Menu/CPlaylist.cs @@ -181,7 +181,6 @@ namespace VocaluxeLib.Menu public int DragAndDropSongID = -1; //private static - public CPlaylist(int PartyModeID) { _PartyModeID = PartyModeID; @@ -511,16 +510,18 @@ namespace VocaluxeLib.Menu } else { - if (CurrentPlaylistElement == -1 || PlaylistElementContents.Count == 0) //no song is selected + if (CurrentPlaylistElement == -1 || PlaylistElementContents.Count == 0) { + //no song is selected _Interactions.HandleInput(KeyEvent); CurrentPlaylistElement = GetSelectedSelectionNr(); if (CurrentPlaylistElement != -1) return true; } - else if (CurrentPlaylistElement != -1) //a song is selected + else if (CurrentPlaylistElement != -1) { + //a song is selected int ScrollLimit = PlaylistElements.Count / 2; //special actions if a song is selected diff --git a/VocaluxeLib/Menu/CSelectSlide.cs b/VocaluxeLib/Menu/CSelectSlide.cs index fedc25f7..b9482346 100644 --- a/VocaluxeLib/Menu/CSelectSlide.cs +++ b/VocaluxeLib/Menu/CSelectSlide.cs @@ -115,7 +115,6 @@ namespace VocaluxeLib.Menu { if (_Selection >= 0 && _ValueIndexes.Count > _Selection) return _ValueIndexes[_Selection]; - else return -1; } @@ -726,7 +725,6 @@ namespace VocaluxeLib.Menu float x = Rect.X + (Rect.W - TextRelativeX) * 0.1f; float dx = (Rect.W - TextRelativeX) * 0.8f / _NumVisible; //float y = Rect.Y + (Rect.H - TextH); - int offset = _Selection - _NumVisible / 2; if (_ValueNames.Count - _NumVisible - offset < 0) @@ -810,7 +808,7 @@ namespace VocaluxeLib.Menu public object Clone() { - return base.MemberwiseClone(); + return this.MemberwiseClone(); } #region ThemeEdit diff --git a/VocaluxeLib/Menu/CText.cs b/VocaluxeLib/Menu/CText.cs index e5f66caf..2dfe4b20 100644 --- a/VocaluxeLib/Menu/CText.cs +++ b/VocaluxeLib/Menu/CText.cs @@ -49,8 +49,9 @@ namespace VocaluxeLib.Menu private STextPosition _DrawPosition = new STextPosition(0); private float _X; - public float X //left + public float X { + //left get { return _X; } set { @@ -63,8 +64,9 @@ namespace VocaluxeLib.Menu } private float _Y; - public float Y //higher + public float Y { + //higher get { return _Y; } set { @@ -238,7 +240,7 @@ namespace VocaluxeLib.Menu { if (_EditMode != value) { - _Text = (value) ? _Text + "|" : _Text.Substring(0, _Text.Length - 1); + _Text = value ? _Text + "|" : _Text.Substring(0, _Text.Length - 1); _EditMode = value; _PositionNeedsUpdate = true; } diff --git a/VocaluxeLib/Menu/SingNotes/CNotes.cs b/VocaluxeLib/Menu/SingNotes/CNotes.cs index 68b4be3c..7e424075 100644 --- a/VocaluxeLib/Menu/SingNotes/CNotes.cs +++ b/VocaluxeLib/Menu/SingNotes/CNotes.cs @@ -414,7 +414,7 @@ namespace VocaluxeLib.Menu.SingNotes if (CompareLine.Points == 0) return false; - _PerfectLine = (Points == CompareLine.Points); + _PerfectLine = Points == CompareLine.Points; return _PerfectLine; } diff --git a/VocaluxeLib/Menu/SingNotes/CSingNotes.cs b/VocaluxeLib/Menu/SingNotes/CSingNotes.cs index 2caea67c..0854739f 100644 --- a/VocaluxeLib/Menu/SingNotes/CSingNotes.cs +++ b/VocaluxeLib/Menu/SingNotes/CSingNotes.cs @@ -688,7 +688,7 @@ namespace VocaluxeLib.Menu.SingNotes if (XOffset > Rect.W) XOffset = Rect.W; - float dy = Rect.H / (CBase.Settings.GetNumNoteLines()); + float dy = Rect.H / CBase.Settings.GetNumNoteLines(); SRectF rect = new SRectF( Rect.X - dy + XOffset, Rect.Y + dy * (CBase.Settings.GetNumNoteLines() - 1 - (TonePlayer - BaseLine) / 2f), diff --git a/VocaluxeLib/Menu/SongMenu/CSong.cs b/VocaluxeLib/Menu/SongMenu/CSong.cs index f2d43ebf..7ffb8a5e 100644 --- a/VocaluxeLib/Menu/SongMenu/CSong.cs +++ b/VocaluxeLib/Menu/SongMenu/CSong.cs @@ -1035,7 +1035,7 @@ namespace VocaluxeLib.Menu.SongMenu public object Clone() { - return base.MemberwiseClone(); + return this.MemberwiseClone(); } } } \ No newline at end of file diff --git a/VocaluxeLib/Menu/SongMenu/CSongMenu.cs b/VocaluxeLib/Menu/SongMenu/CSongMenu.cs index 4cbc822e..9742e62f 100644 --- a/VocaluxeLib/Menu/SongMenu/CSongMenu.cs +++ b/VocaluxeLib/Menu/SongMenu/CSongMenu.cs @@ -212,7 +212,6 @@ namespace VocaluxeLib.Menu.SongMenu //case ESongMenu.TR_CONFIG_DREIDEL: // _SongMenu = new CSongMenuDreidel(); // break; - case ESongMenu.TR_CONFIG_TILE_BOARD: _SongMenu = new CSongMenuTileBoard(_PartyModeID); break; diff --git a/VocaluxeLib/Menu/SongMenu/CSongMenuDreidel.cs b/VocaluxeLib/Menu/SongMenu/CSongMenuDreidel.cs index 98f44e6a..27898f75 100644 --- a/VocaluxeLib/Menu/SongMenu/CSongMenuDreidel.cs +++ b/VocaluxeLib/Menu/SongMenu/CSongMenuDreidel.cs @@ -21,7 +21,6 @@ return _actualSelection; } */ - public CSongMenuDreidel(int PartyModeID) : base(PartyModeID) {} diff --git a/VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs b/VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs index 0e59c3eb..12f0f348 100644 --- a/VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs +++ b/VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs @@ -110,8 +110,9 @@ namespace VocaluxeLib.Menu.SongMenu protected float _MaxVolume = 100f; - protected int _PreviewSelected //for preview only + protected int _PreviewSelected { + //for preview only get { if ((_SelectedInternal != _SelectedPending) && (_timer.ElapsedMilliseconds >= _PendingTime)) @@ -158,8 +159,9 @@ namespace VocaluxeLib.Menu.SongMenu _SelectedInternal = _SelectedPending; } - protected int _Locked //the real selected song for singing + protected int _Locked { + //the real selected song for singing get { return _LockedInternal; } set { _LockedInternal = value; } } @@ -439,7 +441,7 @@ namespace VocaluxeLib.Menu.SongMenu float vtime = 0f; CBase.Video.GetFrame(_video, ref _vidtex, time, ref vtime); if (_VideoFadeTimer.ElapsedMilliseconds <= 3000L) - _vidtex.color.A = (_VideoFadeTimer.ElapsedMilliseconds / 3000f); + _vidtex.color.A = _VideoFadeTimer.ElapsedMilliseconds / 3000f; else { _vidtex.color.A = 1f; diff --git a/VocaluxeLib/Menu/SongMenu/CSongMenuTileBoard.cs b/VocaluxeLib/Menu/SongMenu/CSongMenuTileBoard.cs index 508dd6c9..39fdcd15 100644 --- a/VocaluxeLib/Menu/SongMenu/CSongMenuTileBoard.cs +++ b/VocaluxeLib/Menu/SongMenu/CSongMenuTileBoard.cs @@ -341,7 +341,7 @@ namespace VocaluxeLib.Menu.SongMenu if (!sel) _actualSelection = -1; - if ((MouseEvent.RB) && (CBase.Songs.GetNumCategories() > 0) && CBase.Songs.GetCurrentCategoryIndex() >= 0 && CBase.Songs.GetTabs() == EOffOn.TR_CONFIG_ON && + if (MouseEvent.RB && (CBase.Songs.GetNumCategories() > 0) && CBase.Songs.GetCurrentCategoryIndex() >= 0 && CBase.Songs.GetTabs() == EOffOn.TR_CONFIG_ON && SongOptions.Selection.CategoryChangeAllowed) { ShowCategories(); @@ -355,7 +355,7 @@ namespace VocaluxeLib.Menu.SongMenu if (CHelper.IsInBounds(_CoverBig.Rect, MouseEvent) || CHelper.IsInBounds(_TextBG.Rect, MouseEvent)) _Locked = _PreviewSelected; } - else if ((MouseEvent.LB) && (CBase.Songs.GetCurrentCategoryIndex() == -1)) + else if (MouseEvent.LB && (CBase.Songs.GetCurrentCategoryIndex() == -1)) { foreach (CStatic tile in _Tiles) { @@ -605,7 +605,7 @@ namespace VocaluxeLib.Menu.SongMenu private void UpdateList(int offset, bool force = false) { bool isInCategory = CBase.Songs.GetCurrentCategoryIndex() >= 0; - int itemCount = (isInCategory) ? CBase.Songs.GetNumVisibleSongs() : CBase.Songs.GetNumCategories(); + int itemCount = isInCategory ? CBase.Songs.GetNumVisibleSongs() : CBase.Songs.GetNumCategories(); if (offset >= (itemCount / _NumW) * _NumW - (_NumW * (_NumH - 1))) offset = (itemCount / _NumW) * _NumW - (_NumW * (_NumH - 1)); diff --git a/VocaluxeLib/Properties/AssemblyInfo.cs b/VocaluxeLib/Properties/AssemblyInfo.cs index 7489f374..48dc08f0 100644 --- a/VocaluxeLib/Properties/AssemblyInfo.cs +++ b/VocaluxeLib/Properties/AssemblyInfo.cs @@ -4,7 +4,6 @@ using System.Runtime.InteropServices; // Allgemeine Informationen über eine Assembly werden über die folgenden // Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern, // die mit einer Assembly verknüpft sind. - [assembly: AssemblyTitle("VocaluxeLib")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] @@ -17,11 +16,9 @@ using System.Runtime.InteropServices; // Durch Festlegen von ComVisible auf "false" werden die Typen in dieser Assembly unsichtbar // für COM-Komponenten. Wenn Sie auf einen Typ in dieser Assembly von // COM zugreifen müssen, legen Sie das ComVisible-Attribut für diesen Typ auf "true" fest. - [assembly: ComVisible(false)] // Die folgende GUID bestimmt die ID der Typbibliothek, wenn dieses Projekt für COM verfügbar gemacht wird - [assembly: Guid("3fb7cd34-186d-4f89-beb5-8830b8e5593b")] // Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten: @@ -34,6 +31,5 @@ using System.Runtime.InteropServices; // Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern // übernehmen, indem Sie "*" eingeben: // [assembly: AssemblyVersion("1.0.*")] - [assembly: AssemblyVersion("1.0.0.0")] [assembly: AssemblyFileVersion("1.0.0.0")] \ No newline at end of file diff --git a/VocaluxeLib/Settings.StyleCop b/VocaluxeLib/Settings.StyleCop new file mode 100644 index 00000000..72ed49f9 --- /dev/null +++ b/VocaluxeLib/Settings.StyleCop @@ -0,0 +1,809 @@ + + + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + False + + + + + + + \ No newline at end of file