Projects/Vocaluxe
2
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Preparation for namestyle fixing: fixed ambiguous name

Browse Source
This commit is contained in:
Flamefire committed 2013-04-05 19:56:51 +02:00
1 parent b0b3c09ab4
commit 498cb09dd2
14 files changed
+145 -127
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

PartyModes/PartyModeChallenge/PartyModeChallenge.cs
+11 -11
View File
@@ -192,17 +192,17 @@ namespace VocaluxeLib.PartyModes.Challenge
public override void DataFromScreen(string ScreenName, Object Data) public override void DataFromScreen(string ScreenName, Object Data)
{ {
DataFromScreen data = new DataFromScreen(); DataFromScreen dataFrom = new DataFromScreen();
switch (ScreenName) switch (ScreenName)
{ {
case "PartyScreenChallengeConfig": case "PartyScreenChallengeConfig":
try try
{ {
data = (DataFromScreen)Data; dataFrom = (DataFromScreen)Data;
GameData.NumPlayer = data.ScreenConfig.NumPlayer; GameData.NumPlayer = dataFrom.ScreenConfig.NumPlayer;
GameData.NumPlayerAtOnce = data.ScreenConfig.NumPlayerAtOnce; GameData.NumPlayerAtOnce = dataFrom.ScreenConfig.NumPlayerAtOnce;
GameData.NumRounds = data.ScreenConfig.NumRounds; GameData.NumRounds = dataFrom.ScreenConfig.NumRounds;
_Stage = EStage.Config; _Stage = EStage.Config;
CBase.Graphics.FadeTo(EScreens.ScreenPartyDummy); CBase.Graphics.FadeTo(EScreens.ScreenPartyDummy);
@@ -216,12 +216,12 @@ namespace VocaluxeLib.PartyModes.Challenge
case "PartyScreenChallengeNames": case "PartyScreenChallengeNames":
try try
{ {
data = (DataFromScreen)Data; dataFrom = (DataFromScreen)Data;
if (data.ScreenNames.FadeToConfig) if (dataFrom.ScreenNames.FadeToConfig)
_Stage = EStage.NotStarted; _Stage = EStage.NotStarted;
else else
{ {
GameData.ProfileIDs = data.ScreenNames.ProfileIDs; GameData.ProfileIDs = dataFrom.ScreenNames.ProfileIDs;
_Stage = EStage.Names; _Stage = EStage.Names;
} }
@@ -236,10 +236,10 @@ namespace VocaluxeLib.PartyModes.Challenge
case "PartyScreenChallengeMain": case "PartyScreenChallengeMain":
try try
{ {
data = (DataFromScreen)Data; dataFrom = (DataFromScreen)Data;
if (data.ScreenMain.FadeToSongSelection) if (dataFrom.ScreenMain.FadeToSongSelection)
_Stage = EStage.Singing; _Stage = EStage.Singing;
if (data.ScreenMain.FadeToNameSelection) if (dataFrom.ScreenMain.FadeToNameSelection)
_Stage = EStage.Config; _Stage = EStage.Config;
} }
catch (Exception e) catch (Exception e)
PartyModes/PartyModeChallengeMedley/PartyModeChallengeMedley.cs
+11 -11
View File
@@ -197,17 +197,17 @@ namespace VocaluxeLib.PartyModes.ChallengeMedley
public override void DataFromScreen(string ScreenName, Object Data) public override void DataFromScreen(string ScreenName, Object Data)
{ {
DataFromScreen data = new DataFromScreen(); DataFromScreen dataFrom = new DataFromScreen();
switch (ScreenName) switch (ScreenName)
{ {
case "PartyScreenChallengeMedleyConfig": case "PartyScreenChallengeMedleyConfig":
try try
{ {
data = (DataFromScreen)Data; dataFrom = (DataFromScreen)Data;
GameData.NumPlayer = data.ScreenConfig.NumPlayer; GameData.NumPlayer = dataFrom.ScreenConfig.NumPlayer;
GameData.NumPlayerAtOnce = data.ScreenConfig.NumPlayerAtOnce; GameData.NumPlayerAtOnce = dataFrom.ScreenConfig.NumPlayerAtOnce;
GameData.NumRounds = data.ScreenConfig.NumRounds; GameData.NumRounds = dataFrom.ScreenConfig.NumRounds;
_Stage = EStage.Config; _Stage = EStage.Config;
CBase.Graphics.FadeTo(EScreens.ScreenPartyDummy); CBase.Graphics.FadeTo(EScreens.ScreenPartyDummy);
@@ -221,12 +221,12 @@ namespace VocaluxeLib.PartyModes.ChallengeMedley
case "PartyScreenChallengeMedleyNames": case "PartyScreenChallengeMedleyNames":
try try
{ {
data = (DataFromScreen)Data; dataFrom = (DataFromScreen)Data;
if (data.ScreenNames.FadeToConfig) if (dataFrom.ScreenNames.FadeToConfig)
_Stage = EStage.NotStarted; _Stage = EStage.NotStarted;
else else
{ {
GameData.ProfileIDs = data.ScreenNames.ProfileIDs; GameData.ProfileIDs = dataFrom.ScreenNames.ProfileIDs;
_Stage = EStage.Names; _Stage = EStage.Names;
} }
@@ -241,10 +241,10 @@ namespace VocaluxeLib.PartyModes.ChallengeMedley
case "PartyScreenChallengeMedleyMain": case "PartyScreenChallengeMedleyMain":
try try
{ {
data = (DataFromScreen)Data; dataFrom = (DataFromScreen)Data;
if (data.ScreenMain.FadeToSongSelection) if (dataFrom.ScreenMain.FadeToSongSelection)
_Stage = EStage.Singing; _Stage = EStage.Singing;
if (data.ScreenMain.FadeToNameSelection) if (dataFrom.ScreenMain.FadeToNameSelection)
_Stage = EStage.Config; _Stage = EStage.Config;
} }
catch (Exception e) catch (Exception e)
PartyModes/PartyModeTicTacToe/PartyModeTicTacToe.cs
+22 -22
View File
@@ -225,21 +225,21 @@ namespace VocaluxeLib.PartyModes.TicTacToe
public override void DataFromScreen(string ScreenName, Object Data) public override void DataFromScreen(string ScreenName, Object Data)
{ {
DataFromScreen data = new DataFromScreen(); DataFromScreen dataFrom = new DataFromScreen();
switch (ScreenName) switch (ScreenName)
{ {
case "PartyScreenTicTacToeConfig": case "PartyScreenTicTacToeConfig":
try try
{ {
data = (DataFromScreen)Data; dataFrom = (DataFromScreen)Data;
GameData.NumPlayerTeam1 = data.ScreenConfig.NumPlayerTeam1; GameData.NumPlayerTeam1 = dataFrom.ScreenConfig.NumPlayerTeam1;
GameData.NumPlayerTeam2 = data.ScreenConfig.NumPlayerTeam2; GameData.NumPlayerTeam2 = dataFrom.ScreenConfig.NumPlayerTeam2;
GameData.NumFields = data.ScreenConfig.NumFields; GameData.NumFields = dataFrom.ScreenConfig.NumFields;
GameData.SongSource = data.ScreenConfig.SongSource; GameData.SongSource = dataFrom.ScreenConfig.SongSource;
GameData.CategoryID = data.ScreenConfig.CategoryID; GameData.CategoryID = dataFrom.ScreenConfig.CategoryID;
GameData.PlaylistID = data.ScreenConfig.PlaylistID; GameData.PlaylistID = dataFrom.ScreenConfig.PlaylistID;
GameData.GameMode = data.ScreenConfig.GameMode; GameData.GameMode = dataFrom.ScreenConfig.GameMode;
_Stage = EStage.Config; _Stage = EStage.Config;
CBase.Graphics.FadeTo(EScreens.ScreenPartyDummy); CBase.Graphics.FadeTo(EScreens.ScreenPartyDummy);
@@ -253,8 +253,8 @@ namespace VocaluxeLib.PartyModes.TicTacToe
case "PartyScreenTicTacToeNames": case "PartyScreenTicTacToeNames":
try try
{ {
data = (DataFromScreen)Data; dataFrom = (DataFromScreen)Data;
if (data.ScreenNames.FadeToConfig) if (dataFrom.ScreenNames.FadeToConfig)
_Stage = EStage.NotStarted; _Stage = EStage.NotStarted;
else else
{ {
@@ -262,8 +262,8 @@ namespace VocaluxeLib.PartyModes.TicTacToe
GameData.Team = 0; GameData.Team = 0;
else else
GameData.Team = 1; GameData.Team = 1;
GameData.ProfileIDsTeam1 = data.ScreenNames.ProfileIDsTeam1; GameData.ProfileIDsTeam1 = dataFrom.ScreenNames.ProfileIDsTeam1;
GameData.ProfileIDsTeam2 = data.ScreenNames.ProfileIDsTeam2; GameData.ProfileIDsTeam2 = dataFrom.ScreenNames.ProfileIDsTeam2;
_Stage = EStage.Names; _Stage = EStage.Names;
} }
@@ -278,17 +278,17 @@ namespace VocaluxeLib.PartyModes.TicTacToe
case "PartyScreenTicTacToeMain": case "PartyScreenTicTacToeMain":
try try
{ {
data = (DataFromScreen)Data; dataFrom = (DataFromScreen)Data;
if (data.ScreenMain.FadeToSinging) if (dataFrom.ScreenMain.FadeToSinging)
{ {
_Stage = EStage.Singing; _Stage = EStage.Singing;
GameData.Rounds = data.ScreenMain.Rounds; GameData.Rounds = dataFrom.ScreenMain.Rounds;
GameData.SingRoundNr = data.ScreenMain.SingRoundNr; GameData.SingRoundNr = dataFrom.ScreenMain.SingRoundNr;
GameData.Songs = data.ScreenMain.Songs; GameData.Songs = dataFrom.ScreenMain.Songs;
GameData.PlayerTeam1 = data.ScreenMain.PlayerTeam1; GameData.PlayerTeam1 = dataFrom.ScreenMain.PlayerTeam1;
GameData.PlayerTeam2 = data.ScreenMain.PlayerTeam2; GameData.PlayerTeam2 = dataFrom.ScreenMain.PlayerTeam2;
} }
if (data.ScreenMain.FadeToNameSelection) if (dataFrom.ScreenMain.FadeToNameSelection)
_Stage = EStage.Config; _Stage = EStage.Config;
} }
catch (Exception e) catch (Exception e)
@@ -298,7 +298,7 @@ namespace VocaluxeLib.PartyModes.TicTacToe
if (_Stage == EStage.Singing) if (_Stage == EStage.Singing)
StartRound(data.ScreenMain.SingRoundNr); StartRound(dataFrom.ScreenMain.SingRoundNr);
if (_Stage == EStage.Config) if (_Stage == EStage.Config)
CBase.Graphics.FadeTo(EScreens.ScreenPartyDummy); CBase.Graphics.FadeTo(EScreens.ScreenPartyDummy);
break; break;
Re#Settings.DotSettings
+19 -1
View File
@@ -1,10 +1,11 @@
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation"> <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
<s:String x:Key="/Default/CodeInspection/Highlighting/AnalysisEnabled/@EntryValue">SOLUTION</s:String> <s:String x:Key="/Default/CodeInspection/Highlighting/AnalysisEnabled/@EntryValue">SOLUTION</s:String>
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EmptyGeneralCatchClause/@EntryIndexedValue">DO_NOT_SHOW</s:String>
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantExplicitArrayCreation/@EntryIndexedValue">DO_NOT_SHOW</s:String> <s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantExplicitArrayCreation/@EntryIndexedValue">DO_NOT_SHOW</s:String>
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SpecifyACultureInStringConversionExplicitly/@EntryIndexedValue">DO_NOT_SHOW</s:String> <s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SpecifyACultureInStringConversionExplicitly/@EntryIndexedValue">DO_NOT_SHOW</s:String>
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SuggestUseVarKeywordEverywhere/@EntryIndexedValue">DO_NOT_SHOW</s:String> <s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SuggestUseVarKeywordEverywhere/@EntryIndexedValue">DO_NOT_SHOW</s:String>
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SuggestUseVarKeywordEvident/@EntryIndexedValue">DO_NOT_SHOW</s:String> <s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SuggestUseVarKeywordEvident/@EntryIndexedValue">DO_NOT_SHOW</s:String>
<s:String x:Key="/Default/CodeStyle/CodeCleanup/Profiles/=Cleanup/@EntryIndexedValue">&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;Profile name="Cleanup"&gt;&lt;CSArrangeThisQualifier&gt;True&lt;/CSArrangeThisQualifier&gt;&lt;CSRemoveCodeRedundancies&gt;True&lt;/CSRemoveCodeRedundancies&gt;&lt;CSMakeFieldReadonly&gt;True&lt;/CSMakeFieldReadonly&gt;&lt;CSUseVar&gt;&lt;BehavourStyle&gt;CAN_CHANGE_TO_EXPLICIT&lt;/BehavourStyle&gt;&lt;LocalVariableStyle&gt;ALWAYS_EXPLICIT&lt;/LocalVariableStyle&gt;&lt;ForeachVariableStyle&gt;ALWAYS_EXPLICIT&lt;/ForeachVariableStyle&gt;&lt;/CSUseVar&gt;&lt;CSOptimizeUsings&gt;&lt;OptimizeUsings&gt;False&lt;/OptimizeUsings&gt;&lt;EmbraceInRegion&gt;False&lt;/EmbraceInRegion&gt;&lt;RegionName&gt;&lt;/RegionName&gt;&lt;/CSOptimizeUsings&gt;&lt;CSReformatCode&gt;True&lt;/CSReformatCode&gt;&lt;CSharpFormatDocComments&gt;True&lt;/CSharpFormatDocComments&gt;&lt;CSShortenReferences&gt;True&lt;/CSShortenReferences&gt;&lt;StyleCop.Documentation&gt;&lt;SA1600ElementsMustBeDocumented&gt;False&lt;/SA1600ElementsMustBeDocumented&gt;&lt;SA1604ElementDocumentationMustHaveSummary&gt;False&lt;/SA1604ElementDocumentationMustHaveSummary&gt;&lt;SA1609PropertyDocumentationMustHaveValueDocumented&gt;False&lt;/SA1609PropertyDocumentationMustHaveValueDocumented&gt;&lt;SA1611ElementParametersMustBeDocumented&gt;False&lt;/SA1611ElementParametersMustBeDocumented&gt;&lt;SA1615ElementReturnValueMustBeDocumented&gt;False&lt;/SA1615ElementReturnValueMustBeDocumented&gt;&lt;SA1617VoidReturnValueMustNotBeDocumented&gt;False&lt;/SA1617VoidReturnValueMustNotBeDocumented&gt;&lt;SA1618GenericTypeParametersMustBeDocumented&gt;False&lt;/SA1618GenericTypeParametersMustBeDocumented&gt;&lt;SA1626SingleLineCommentsMustNotUseDocumentationStyleSlashes&gt;False&lt;/SA1626SingleLineCommentsMustNotUseDocumentationStyleSlashes&gt;&lt;SA1628DocumentationTextMustBeginWithACapitalLetter&gt;False&lt;/SA1628DocumentationTextMustBeginWithACapitalLetter&gt;&lt;SA1629DocumentationTextMustEndWithAPeriod&gt;False&lt;/SA1629DocumentationTextMustEndWithAPeriod&gt;&lt;SA1633SA1641UpdateFileHeader&gt;Ignore&lt;/SA1633SA1641UpdateFileHeader&gt;&lt;SA1639FileHeaderMustHaveSummary&gt;False&lt;/SA1639FileHeaderMustHaveSummary&gt;&lt;SA1642ConstructorSummaryDocumentationMustBeginWithStandardText&gt;False&lt;/SA1642ConstructorSummaryDocumentationMustBeginWithStandardText&gt;&lt;SA1643DestructorSummaryDocumentationMustBeginWithStandardText&gt;False&lt;/SA1643DestructorSummaryDocumentationMustBeginWithStandardText&gt;&lt;SA1644DocumentationHeadersMustNotContainBlankLines&gt;False&lt;/SA1644DocumentationHeadersMustNotContainBlankLines&gt;&lt;/StyleCop.Documentation&gt;&lt;StyleCop.Layout&gt;&lt;SA1500CurlyBracketsForMultiLineStatementsMustNotShareLine&gt;False&lt;/SA1500CurlyBracketsForMultiLineStatementsMustNotShareLine&gt;&lt;SA1509OpeningCurlyBracketsMustNotBePrecededByBlankLine&gt;True&lt;/SA1509OpeningCurlyBracketsMustNotBePrecededByBlankLine&gt;&lt;SA1510ChainedStatementBlocksMustNotBePrecededByBlankLine&gt;True&lt;/SA1510ChainedStatementBlocksMustNotBePrecededByBlankLine&gt;&lt;SA1511WhileDoFooterMustNotBePrecededByBlankLine&gt;True&lt;/SA1511WhileDoFooterMustNotBePrecededByBlankLine&gt;&lt;SA1512SingleLineCommentsMustNotBeFollowedByBlankLine&gt;True&lt;/SA1512SingleLineCommentsMustNotBeFollowedByBlankLine&gt;&lt;SA1513ClosingCurlyBracketMustBeFollowedByBlankLine&gt;False&lt;/SA1513ClosingCurlyBracketMustBeFollowedByBlankLine&gt;&lt;SA1514ElementDocumentationHeaderMustBePrecededByBlankLine&gt;False&lt;/SA1514ElementDocumentationHeaderMustBePrecededByBlankLine&gt;&lt;SA1515SingleLineCommentMustBeProceededByBlankLine&gt;False&lt;/SA1515SingleLineCommentMustBeProceededByBlankLine&gt;&lt;/StyleCop.Layout&gt;&lt;StyleCop.Readability&gt;&lt;SA1100DoNotPrefixCallsWithBaseUnlessLocalImplementationExists&gt;True&lt;/SA1100DoNotPrefixCallsWithBaseUnlessLocalImplementationExists&gt;&lt;SA1106CodeMustNotContainEmptyStatements&gt;True&lt;/SA1106CodeMustNotContainEmptyStatements&gt;&lt;SA1108BlockStatementsMustNotContainEmbeddedComments&gt;True&lt;/SA1108BlockStatementsMustNotContainEmbeddedComments&gt;&lt;SA1109BlockStatementsMustNotContainEmbeddedRegions&gt;True&lt;/SA1109BlockStatementsMustNotContainEmbeddedRegions&gt;&lt;SA1120CommentsMustContainText&gt;False&lt;/SA1120CommentsMustContainText&gt;&lt;SA1121UseBuiltInTypeAlias&gt;False&lt;/SA1121UseBuiltInTypeAlias&gt;&lt;SA1122UseStringEmptyForEmptyStrings&gt;False&lt;/SA1122UseStringEmptyForEmptyStrings&gt;&lt;SA1123DoNotPlaceRegionsWithinElements&gt;False&lt;/SA1123DoNotPlaceRegionsWithinElements&gt;&lt;SA1124CodeMustNotContainEmptyRegions&gt;True&lt;/SA1124CodeMustNotContainEmptyRegions&gt;&lt;/StyleCop.Readability&gt;&lt;StyleCop.Spacing&gt;&lt;SA1001CommasMustBeSpacedCorrectly&gt;False&lt;/SA1001CommasMustBeSpacedCorrectly&gt;&lt;SA1005SingleLineCommentsMustBeginWithSingleSpace&gt;False&lt;/SA1005SingleLineCommentsMustBeginWithSingleSpace&gt;&lt;SA1006PreprocessorKeywordsMustNotBePrecededBySpaLine truncated <s:String x:Key="/Default/CodeStyle/CodeCleanup/Profiles/=Cleanup/@EntryIndexedValue">&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;Profile name="Cleanup"&gt;&lt;CSArrangeThisQualifier&gt;True&lt;/CSArrangeThisQualifier&gt;&lt;CSRemoveCodeRedundancies&gt;True&lt;/CSRemoveCodeRedundancies&gt;&lt;CSMakeFieldReadonly&gt;True&lt;/CSMakeFieldReadonly&gt;&lt;CSUseVar&gt;&lt;BehavourStyle&gt;CAN_CHANGE_TO_EXPLICIT&lt;/BehavourStyle&gt;&lt;LocalVariableStyle&gt;ALWAYS_EXPLICIT&lt;/LocalVariableStyle&gt;&lt;ForeachVariableStyle&gt;ALWAYS_EXPLICIT&lt;/ForeachVariableStyle&gt;&lt;/CSUseVar&gt;&lt;CSOptimizeUsings&gt;&lt;OptimizeUsings&gt;False&lt;/OptimizeUsings&gt;&lt;EmbraceInRegion&gt;False&lt;/EmbraceInRegion&gt;&lt;RegionName&gt;&lt;/RegionName&gt;&lt;/CSOptimizeUsings&gt;&lt;CSReformatCode&gt;True&lt;/CSReformatCode&gt;&lt;CSharpFormatDocComments&gt;True&lt;/CSharpFormatDocComments&gt;&lt;CSShortenReferences&gt;True&lt;/CSShortenReferences&gt;&lt;StyleCop.Documentation&gt;&lt;SA1600ElementsMustBeDocumented&gt;False&lt;/SA1600ElementsMustBeDocumented&gt;&lt;SA1604ElementDocumentationMustHaveSummary&gt;False&lt;/SA1604ElementDocumentationMustHaveSummary&gt;&lt;SA1609PropertyDocumentationMustHaveValueDocumented&gt;False&lt;/SA1609PropertyDocumentationMustHaveValueDocumented&gt;&lt;SA1611ElementParametersMustBeDocumented&gt;False&lt;/SA1611ElementParametersMustBeDocumented&gt;&lt;SA1615ElementReturnValueMustBeDocumented&gt;False&lt;/SA1615ElementReturnValueMustBeDocumented&gt;&lt;SA1617VoidReturnValueMustNotBeDocumented&gt;False&lt;/SA1617VoidReturnValueMustNotBeDocumented&gt;&lt;SA1618GenericTypeParametersMustBeDocumented&gt;False&lt;/SA1618GenericTypeParametersMustBeDocumented&gt;&lt;SA1626SingleLineCommentsMustNotUseDocumentationStyleSlashes&gt;False&lt;/SA1626SingleLineCommentsMustNotUseDocumentationStyleSlashes&gt;&lt;SA1628DocumentationTextMustBeginWithACapitalLetter&gt;False&lt;/SA1628DocumentationTextMustBeginWithACapitalLetter&gt;&lt;SA1629DocumentationTextMustEndWithAPeriod&gt;False&lt;/SA1629DocumentationTextMustEndWithAPeriod&gt;&lt;SA1633SA1641UpdateFileHeader&gt;Ignore&lt;/SA1633SA1641UpdateFileHeader&gt;&lt;SA1639FileHeaderMustHaveSummary&gt;False&lt;/SA1639FileHeaderMustHaveSummary&gt;&lt;SA1642ConstructorSummaryDocumentationMustBeginWithStandardText&gt;False&lt;/SA1642ConstructorSummaryDocumentationMustBeginWithStandardText&gt;&lt;SA1643DestructorSummaryDocumentationMustBeginWithStandardText&gt;False&lt;/SA1643DestructorSummaryDocumentationMustBeginWithStandardText&gt;&lt;SA1644DocumentationHeadersMustNotContainBlankLines&gt;False&lt;/SA1644DocumentationHeadersMustNotContainBlankLines&gt;&lt;/StyleCop.Documentation&gt;&lt;StyleCop.Layout&gt;&lt;SA1500CurlyBracketsForMultiLineStatementsMustNotShareLine&gt;False&lt;/SA1500CurlyBracketsForMultiLineStatementsMustNotShareLine&gt;&lt;SA1509OpeningCurlyBracketsMustNotBePrecededByBlankLine&gt;True&lt;/SA1509OpeningCurlyBracketsMustNotBePrecededByBlankLine&gt;&lt;SA1510ChainedStatementBlocksMustNotBePrecededByBlankLine&gt;True&lt;/SA1510ChainedStatementBlocksMustNotBePrecededByBlankLine&gt;&lt;SA1511WhileDoFooterMustNotBePrecededByBlankLine&gt;True&lt;/SA1511WhileDoFooterMustNotBePrecededByBlankLine&gt;&lt;SA1512SingleLineCommentsMustNotBeFollowedByBlankLine&gt;True&lt;/SA1512SingleLineCommentsMustNotBeFollowedByBlankLine&gt;&lt;SA1513ClosingCurlyBracketMustBeFollowedByBlankLine&gt;False&lt;/SA1513ClosingCurlyBracketMustBeFollowedByBlankLine&gt;&lt;SA1514ElementDocumentationHeaderMustBePrecededByBlankLine&gt;False&lt;/SA1514ElementDocumentationHeaderMustBePrecededByBlankLine&gt;&lt;SA1515SingleLineCommentMustBeProceededByBlankLine&gt;False&lt;/SA1515SingleLineCommentMustBeProceededByBlankLine&gt;&lt;/StyleCop.Layout&gt;&lt;StyleCop.Readability&gt;&lt;SA1100DoNotPrefixCallsWithBaseUnlessLocalImplementationExists&gt;True&lt;/SA1100DoNotPrefixCallsWithBaseUnlessLocalImplementationExists&gt;&lt;SA1106CodeMustNotContainEmptyStatements&gt;True&lt;/SA1106CodeMustNotContainEmptyStatements&gt;&lt;SA1108BlockStatementsMustNotContainEmbeddedComments&gt;True&lt;/SA1108BlockStatementsMustNotContainEmbeddedComments&gt;&lt;SA1109BlockStatementsMustNotContainEmbeddedRegions&gt;True&lt;/SA1109BlockStatementsMustNotContainEmbeddedRegions&gt;&lt;SA1120CommentsMustContainText&gt;False&lt;/SA1120CommentsMustContainText&gt;&lt;SA1121UseBuiltInTypeAlias&gt;False&lt;/SA1121UseBuiltInTypeAlias&gt;&lt;SA1122UseStringEmptyForEmptyStrings&gt;False&lt;/SA1122UseStringEmptyForEmptyStrings&gt;&lt;SA1123DoNotPlaceRegionsWithinElements&gt;False&lt;/SA1123DoNotPlaceRegionsWithinElements&gt;&lt;SA1124CodeMustNotContainEmptyRegions&gt;True&lt;/SA1124CodeMustNotContainEmptyRegions&gt;&lt;/StyleCop.Readability&gt;&lt;StyleCop.Spacing&gt;&lt;SA1001CommasMustBeSpacedCorrectly&gt;False&lt;/SA1001CommasMustBeSpacedCorrectly&gt;&lt;SA1005SingleLineCommentsMustBeginWithSingleSpace&gt;False&lt;/SA1005SingleLineCommentsMustBeginWithSingleSpace&gt;&lt;SA1006PreprocessorKeywordsMustNotBePrecededBySpaLine truncated
<s:String x:Key="/Default/CodeStyle/CodeCleanup/Profiles/=Simple_0020Reformat/@EntryIndexedValue">&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;Profile name="Simple Reformat"&gt;&lt;CSOptimizeUsings&gt;&lt;OptimizeUsings&gt;False&lt;/OptimizeUsings&gt;&lt;EmbraceInRegion&gt;False&lt;/EmbraceInRegion&gt;&lt;RegionName&gt;&lt;/RegionName&gt;&lt;/CSOptimizeUsings&gt;&lt;CSReformatCode&gt;True&lt;/CSReformatCode&gt;&lt;StyleCop.Documentation&gt;&lt;SA1600ElementsMustBeDocumented&gt;False&lt;/SA1600ElementsMustBeDocumented&gt;&lt;SA1604ElementDocumentationMustHaveSummary&gt;False&lt;/SA1604ElementDocumentationMustHaveSummary&gt;&lt;SA1609PropertyDocumentationMustHaveValueDocumented&gt;False&lt;/SA1609PropertyDocumentationMustHaveValueDocumented&gt;&lt;SA1611ElementParametersMustBeDocumented&gt;False&lt;/SA1611ElementParametersMustBeDocumented&gt;&lt;SA1615ElementReturnValueMustBeDocumented&gt;False&lt;/SA1615ElementReturnValueMustBeDocumented&gt;&lt;SA1617VoidReturnValueMustNotBeDocumented&gt;False&lt;/SA1617VoidReturnValueMustNotBeDocumented&gt;&lt;SA1618GenericTypeParametersMustBeDocumented&gt;False&lt;/SA1618GenericTypeParametersMustBeDocumented&gt;&lt;SA1626SingleLineCommentsMustNotUseDocumentationStyleSlashes&gt;False&lt;/SA1626SingleLineCommentsMustNotUseDocumentationStyleSlashes&gt;&lt;SA1628DocumentationTextMustBeginWithACapitalLetter&gt;False&lt;/SA1628DocumentationTextMustBeginWithACapitalLetter&gt;&lt;SA1629DocumentationTextMustEndWithAPeriod&gt;False&lt;/SA1629DocumentationTextMustEndWithAPeriod&gt;&lt;SA1633SA1641UpdateFileHeader&gt;Ignore&lt;/SA1633SA1641UpdateFileHeader&gt;&lt;SA1639FileHeaderMustHaveSummary&gt;False&lt;/SA1639FileHeaderMustHaveSummary&gt;&lt;SA1642ConstructorSummaryDocumentationMustBeginWithStandardText&gt;False&lt;/SA1642ConstructorSummaryDocumentationMustBeginWithStandardText&gt;&lt;SA1643DestructorSummaryDocumentationMustBeginWithStandardText&gt;False&lt;/SA1643DestructorSummaryDocumentationMustBeginWithStandardText&gt;&lt;SA1644DocumentationHeadersMustNotContainBlankLines&gt;False&lt;/SA1644DocumentationHeadersMustNotContainBlankLines&gt;&lt;/StyleCop.Documentation&gt;&lt;StyleCop.Spacing&gt;&lt;SA1001CommasMustBeSpacedCorrectly&gt;False&lt;/SA1001CommasMustBeSpacedCorrectly&gt;&lt;SA1005SingleLineCommentsMustBeginWithSingleSpace&gt;False&lt;/SA1005SingleLineCommentsMustBeginWithSingleSpace&gt;&lt;SA1006PreprocessorKeywordsMustNotBePrecededBySpace&gt;True&lt;/SA1006PreprocessorKeywordsMustNotBePrecededBySpace&gt;&lt;SA1021NegativeSignsMustBeSpacedCorrectly&gt;True&lt;/SA1021NegativeSignsMustBeSpacedCorrectly&gt;&lt;SA1022PositiveSignsMustBeSpacedCorrectly&gt;True&lt;/SA1022PositiveSignsMustBeSpacedCorrectly&gt;&lt;SA1025CodeMustNotContainMultipleWhitespaceInARow&gt;True&lt;/SA1025CodeMustNotContainMultipleWhitespaceInARow&gt;&lt;/StyleCop.Spacing&gt;&lt;StyleCop.Readability&gt;&lt;SA1100DoNotPrefixCallsWithBaseUnlessLocalImplementationExists&gt;True&lt;/SA1100DoNotPrefixCallsWithBaseUnlessLocalImplementationExists&gt;&lt;SA1106CodeMustNotContainEmptyStatements&gt;True&lt;/SA1106CodeMustNotContainEmptyStatements&gt;&lt;SA1108BlockStatementsMustNotContainEmbeddedComments&gt;True&lt;/SA1108BlockStatementsMustNotContainEmbeddedComments&gt;&lt;SA1109BlockStatementsMustNotContainEmbeddedRegions&gt;True&lt;/SA1109BlockStatementsMustNotContainEmbeddedRegions&gt;&lt;SA1120CommentsMustContainText&gt;False&lt;/SA1120CommentsMustContainText&gt;&lt;SA1121UseBuiltInTypeAlias&gt;False&lt;/SA1121UseBuiltInTypeAlias&gt;&lt;SA1122UseStringEmptyForEmptyStrings&gt;False&lt;/SA1122UseStringEmptyForEmptyStrings&gt;&lt;SA1123DoNotPlaceRegionsWithinElements&gt;False&lt;/SA1123DoNotPlaceRegionsWithinElements&gt;&lt;SA1124CodeMustNotContainEmptyRegions&gt;True&lt;/SA1124CodeMustNotContainEmptyRegions&gt;&lt;/StyleCop.Readability&gt;&lt;StyleCop.Layout&gt;&lt;SA1500CurlyBracketsForMultiLineStatementsMustNotShareLine&gt;False&lt;/SA1500CurlyBracketsForMultiLineStatementsMustNotShareLine&gt;&lt;SA1509OpeningCurlyBracketsMustNotBePrecededByBlankLine&gt;True&lt;/SA1509OpeningCurlyBracketsMustNotBePrecededByBlankLine&gt;&lt;SA1510ChainedStatementBlocksMustNotBePrecededByBlankLine&gt;True&lt;/SA1510ChainedStatementBlocksMustNotBePrecededByBlankLine&gt;&lt;SA1511WhileDoFooterMustNotBePrecededByBlankLine&gt;True&lt;/SA1511WhileDoFooterMustNotBePrecededByBlankLine&gt;&lt;SA1512SingleLineCommentsMustNotBeFollowedByBlankLine&gt;True&lt;/SA1512SingleLineCommentsMustNotBeFollowedByBlankLine&gt;&lt;SA1513ClosingCurlyBracketMustBeFollowedByBlankLine&gt;False&lt;/SA1513ClosingCurlyBracketMustBeFollowedByBlankLine&gt;&lt;SA1514ElementDocumentationHeaderMustBePrecededByBlankLine&gt;False&lt;/SA1514ElementDocumentationHeaderMustBePrecededByBlankLine&gt;&lt;SA1515SingleLineCommentMustBeProceededByBlankLine&gt;False&lt;/SA1515SingleLineCommentMustBeProceededByBlankLine&gt;&lt;/StyleCop.Layout&gt;&lt;StyleCop.Ordering&gt;&lt;AlphabeticalUsingDirectives&gt;Ignore&lt;/AlphabeticalUsingDirectives&gt;&lt;ExpandUsingDirectiLine truncated <s:String x:Key="/Default/CodeStyle/CodeCleanup/Profiles/=Simple_0020Reformat/@EntryIndexedValue">&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;Profile name="Simple Reformat"&gt;&lt;CSOptimizeUsings&gt;&lt;OptimizeUsings&gt;False&lt;/OptimizeUsings&gt;&lt;EmbraceInRegion&gt;False&lt;/EmbraceInRegion&gt;&lt;RegionName&gt;&lt;/RegionName&gt;&lt;/CSOptimizeUsings&gt;&lt;CSReformatCode&gt;True&lt;/CSReformatCode&gt;&lt;StyleCop.Documentation&gt;&lt;SA1600ElementsMustBeDocumented&gt;False&lt;/SA1600ElementsMustBeDocumented&gt;&lt;SA1604ElementDocumentationMustHaveSummary&gt;False&lt;/SA1604ElementDocumentationMustHaveSummary&gt;&lt;SA1609PropertyDocumentationMustHaveValueDocumented&gt;False&lt;/SA1609PropertyDocumentationMustHaveValueDocumented&gt;&lt;SA1611ElementParametersMustBeDocumented&gt;False&lt;/SA1611ElementParametersMustBeDocumented&gt;&lt;SA1615ElementReturnValueMustBeDocumented&gt;False&lt;/SA1615ElementReturnValueMustBeDocumented&gt;&lt;SA1617VoidReturnValueMustNotBeDocumented&gt;False&lt;/SA1617VoidReturnValueMustNotBeDocumented&gt;&lt;SA1618GenericTypeParametersMustBeDocumented&gt;False&lt;/SA1618GenericTypeParametersMustBeDocumented&gt;&lt;SA1626SingleLineCommentsMustNotUseDocumentationStyleSlashes&gt;False&lt;/SA1626SingleLineCommentsMustNotUseDocumentationStyleSlashes&gt;&lt;SA1628DocumentationTextMustBeginWithACapitalLetter&gt;False&lt;/SA1628DocumentationTextMustBeginWithACapitalLetter&gt;&lt;SA1629DocumentationTextMustEndWithAPeriod&gt;False&lt;/SA1629DocumentationTextMustEndWithAPeriod&gt;&lt;SA1633SA1641UpdateFileHeader&gt;Ignore&lt;/SA1633SA1641UpdateFileHeader&gt;&lt;SA1639FileHeaderMustHaveSummary&gt;False&lt;/SA1639FileHeaderMustHaveSummary&gt;&lt;SA1642ConstructorSummaryDocumentationMustBeginWithStandardText&gt;False&lt;/SA1642ConstructorSummaryDocumentationMustBeginWithStandardText&gt;&lt;SA1643DestructorSummaryDocumentationMustBeginWithStandardText&gt;False&lt;/SA1643DestructorSummaryDocumentationMustBeginWithStandardText&gt;&lt;SA1644DocumentationHeadersMustNotContainBlankLines&gt;False&lt;/SA1644DocumentationHeadersMustNotContainBlankLines&gt;&lt;/StyleCop.Documentation&gt;&lt;StyleCop.Spacing&gt;&lt;SA1001CommasMustBeSpacedCorrectly&gt;False&lt;/SA1001CommasMustBeSpacedCorrectly&gt;&lt;SA1005SingleLineCommentsMustBeginWithSingleSpace&gt;False&lt;/SA1005SingleLineCommentsMustBeginWithSingleSpace&gt;&lt;SA1006PreprocessorKeywordsMustNotBePrecededBySpace&gt;True&lt;/SA1006PreprocessorKeywordsMustNotBePrecededBySpace&gt;&lt;SA1021NegativeSignsMustBeSpacedCorrectly&gt;True&lt;/SA1021NegativeSignsMustBeSpacedCorrectly&gt;&lt;SA1022PositiveSignsMustBeSpacedCorrectly&gt;True&lt;/SA1022PositiveSignsMustBeSpacedCorrectly&gt;&lt;SA1025CodeMustNotContainMultipleWhitespaceInARow&gt;True&lt;/SA1025CodeMustNotContainMultipleWhitespaceInARow&gt;&lt;/StyleCop.Spacing&gt;&lt;StyleCop.Readability&gt;&lt;SA1100DoNotPrefixCallsWithBaseUnlessLocalImplementationExists&gt;True&lt;/SA1100DoNotPrefixCallsWithBaseUnlessLocalImplementationExists&gt;&lt;SA1106CodeMustNotContainEmptyStatements&gt;True&lt;/SA1106CodeMustNotContainEmptyStatements&gt;&lt;SA1108BlockStatementsMustNotContainEmbeddedComments&gt;True&lt;/SA1108BlockStatementsMustNotContainEmbeddedComments&gt;&lt;SA1109BlockStatementsMustNotContainEmbeddedRegions&gt;True&lt;/SA1109BlockStatementsMustNotContainEmbeddedRegions&gt;&lt;SA1120CommentsMustContainText&gt;False&lt;/SA1120CommentsMustContainText&gt;&lt;SA1121UseBuiltInTypeAlias&gt;False&lt;/SA1121UseBuiltInTypeAlias&gt;&lt;SA1122UseStringEmptyForEmptyStrings&gt;False&lt;/SA1122UseStringEmptyForEmptyStrings&gt;&lt;SA1123DoNotPlaceRegionsWithinElements&gt;False&lt;/SA1123DoNotPlaceRegionsWithinElements&gt;&lt;SA1124CodeMustNotContainEmptyRegions&gt;True&lt;/SA1124CodeMustNotContainEmptyRegions&gt;&lt;/StyleCop.Readability&gt;&lt;StyleCop.Layout&gt;&lt;SA1500CurlyBracketsForMultiLineStatementsMustNotShareLine&gt;False&lt;/SA1500CurlyBracketsForMultiLineStatementsMustNotShareLine&gt;&lt;SA1509OpeningCurlyBracketsMustNotBePrecededByBlankLine&gt;True&lt;/SA1509OpeningCurlyBracketsMustNotBePrecededByBlankLine&gt;&lt;SA1510ChainedStatementBlocksMustNotBePrecededByBlankLine&gt;True&lt;/SA1510ChainedStatementBlocksMustNotBePrecededByBlankLine&gt;&lt;SA1511WhileDoFooterMustNotBePrecededByBlankLine&gt;True&lt;/SA1511WhileDoFooterMustNotBePrecededByBlankLine&gt;&lt;SA1512SingleLineCommentsMustNotBeFollowedByBlankLine&gt;True&lt;/SA1512SingleLineCommentsMustNotBeFollowedByBlankLine&gt;&lt;SA1513ClosingCurlyBracketMustBeFollowedByBlankLine&gt;False&lt;/SA1513ClosingCurlyBracketMustBeFollowedByBlankLine&gt;&lt;SA1514ElementDocumentationHeaderMustBePrecededByBlankLine&gt;False&lt;/SA1514ElementDocumentationHeaderMustBePrecededByBlankLine&gt;&lt;SA1515SingleLineCommentMustBeProceededByBlankLine&gt;False&lt;/SA1515SingleLineCommentMustBeProceededByBlankLine&gt;&lt;/StyleCop.Layout&gt;&lt;StyleCop.Ordering&gt;&lt;AlphabeticalUsingDirectives&gt;Ignore&lt;/AlphabeticalUsingDirectives&gt;&lt;ExpandUsingDirectiLine truncated
<s:String x:Key="/Default/CodeStyle/CodeCleanup/RecentlyUsedProfile/@EntryValue">Cleanup</s:String> <s:String x:Key="/Default/CodeStyle/CodeCleanup/RecentlyUsedProfile/@EntryValue">Cleanup</s:String>
<s:String x:Key="/Default/CodeStyle/CodeCleanup/SilentCleanupProfile/@EntryValue">Simple Reformat</s:String> <s:String x:Key="/Default/CodeStyle/CodeCleanup/SilentCleanupProfile/@EntryValue">Simple Reformat</s:String>
@@ -32,6 +33,23 @@
<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_MULTIPLE_DECLARATION_STYLE/@EntryValue">WRAP_IF_LONG</s:String> <s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_MULTIPLE_DECLARATION_STYLE/@EntryValue">WRAP_IF_LONG</s:String>
<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_TERNARY_EXPR_STYLE/@EntryValue">WRAP_IF_LONG</s:String> <s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_TERNARY_EXPR_STYLE/@EntryValue">WRAP_IF_LONG</s:String>
<s:Boolean x:Key="/Default/CodeStyle/CSharpUsing/AllowAlias/@EntryValue">False</s:Boolean> <s:Boolean x:Key="/Default/CodeStyle/CSharpUsing/AllowAlias/@EntryValue">False</s:Boolean>
<s:String x:Key="/Default/CodeStyle/FileHeader/FileHeaderRegionName/@EntryValue">license</s:String>
<s:String x:Key="/Default/CodeStyle/FileHeader/FileHeaderText/@EntryValue">/*&#xD;
This file is part of $SOLUTION$.&#xD;
&#xD;
$SOLUTION$ is free software: you can redistribute it and/or modify&#xD;
it under the terms of the GNU General Public License as published by&#xD;
the Free Software Foundation, either version 3 of the License, or&#xD;
(at your option) any later version.&#xD;
&#xD;
$SOLUTION$ is distributed in the hope that it will be useful,&#xD;
but WITHOUT ANY WARRANTY; without even the implied warranty of&#xD;
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the&#xD;
GNU General Public License for more details.&#xD;
&#xD;
You should have received a copy of the GNU General Public License&#xD;
along with $SOLUTION$. If not, see &lt;http://www.gnu.org/licenses/&gt;.&#xD;
*/</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=EnumMember/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String> <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=EnumMember/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateConstants/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="_" Suffix="" Style="AaBb" /&gt;</s:String> <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateConstants/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="_" Suffix="" Style="AaBb" /&gt;</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateInstanceFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="_" Suffix="" Style="AaBb" /&gt;</s:String> <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateInstanceFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="_" Suffix="" Style="AaBb" /&gt;</s:String>
Vocaluxe/Base/CDataBase.cs
+3 -3
View File
@@ -189,13 +189,13 @@ namespace Vocaluxe.Base
return lastInsertID; return lastInsertID;
} }
public static void LoadScore(ref List<SScores> Score, SPlayer player) public static void LoadScore(ref List<SScores> Scores, SPlayer player)
{ {
using (SQLiteConnection connection = new SQLiteConnection()) using (SQLiteConnection connection = new SQLiteConnection())
{ {
connection.ConnectionString = "Data Source=" + _HighscoreFilePath; connection.ConnectionString = "Data Source=" + _HighscoreFilePath;
Score = new List<SScores>(); Scores = new List<SScores>();
try try
{ {
@@ -244,7 +244,7 @@ namespace Vocaluxe.Base
score.LineNr = reader.GetInt32(4); score.LineNr = reader.GetInt32(4);
score.ID = reader.GetInt32(5); score.ID = reader.GetInt32(5);
Score.Add(score); Scores.Add(score);
} }
reader.Dispose(); reader.Dispose();
} }
Vocaluxe/Base/CLog.cs
+8 -8
View File
@@ -5,13 +5,13 @@ using System.Text;
namespace Vocaluxe.Base namespace Vocaluxe.Base
{ {
class Log : IDisposable class LogFile : IDisposable
{ {
private readonly string _LogFileName; private readonly string _LogFileName;
private readonly string _LogName; private readonly string _LogName;
private StreamWriter _LogFile; private StreamWriter _LogFile;
public Log(string FileName, string LogName) public LogFile(string FileName, string LogName)
{ {
_LogName = LogName; _LogName = LogName;
_LogFileName = FileName; _LogFileName = FileName;
@@ -67,9 +67,9 @@ namespace Vocaluxe.Base
{ {
private const int MAXBenchmarks = 10; private const int MAXBenchmarks = 10;
private static Log _ErrorLog; private static LogFile _ErrorLog;
private static Log _PerformanceLog; private static LogFile _PerformanceLog;
private static Log _BenchmarkLog; private static LogFile _BenchmarkLog;
private static int _NumErrors; private static int _NumErrors;
private static Stopwatch[] _BenchmarkTimer; private static Stopwatch[] _BenchmarkTimer;
@@ -77,9 +77,9 @@ namespace Vocaluxe.Base
public static void Init() public static void Init()
{ {
_ErrorLog = new Log(CSettings.sFileErrorLog, "ErrorLog"); _ErrorLog = new LogFile(CSettings.sFileErrorLog, "ErrorLog");
_PerformanceLog = new Log(CSettings.sFilePerformanceLog, "PerformanceLog"); _PerformanceLog = new LogFile(CSettings.sFilePerformanceLog, "PerformanceLog");
_BenchmarkLog = new Log(CSettings.sFileBenchmarkLog, "BenchmarkLog"); _BenchmarkLog = new LogFile(CSettings.sFileBenchmarkLog, "BenchmarkLog");
_NumErrors = 0; _NumErrors = 0;
_BenchmarkTimer = new Stopwatch[MAXBenchmarks]; _BenchmarkTimer = new Stopwatch[MAXBenchmarks];
Vocaluxe/Base/CParty.cs
+6 -6
View File
@@ -330,12 +330,12 @@ namespace Vocaluxe.Base
if (files.Length == 0) if (files.Length == 0)
return null; return null;
CompilerParameters Params = new CompilerParameters(); CompilerParameters compilerParams = new CompilerParameters();
Params.ReferencedAssemblies.Add("System.Windows.Forms.dll"); compilerParams.ReferencedAssemblies.Add("System.Windows.Forms.dll");
Params.ReferencedAssemblies.Add("VocaluxeLib.dll"); compilerParams.ReferencedAssemblies.Add("VocaluxeLib.dll");
Params.GenerateInMemory = true; compilerParams.GenerateInMemory = true;
#if DEBUG #if DEBUG
Params.IncludeDebugInformation = true; compilerParams.IncludeDebugInformation = true;
#endif #endif
using (CodeDomProvider CDP = CodeDomProvider.CreateProvider("CSharp")) using (CodeDomProvider CDP = CodeDomProvider.CreateProvider("CSharp"))
@@ -344,7 +344,7 @@ namespace Vocaluxe.Base
try try
{ {
CompileResult = CDP.CompileAssemblyFromFile(Params, files); CompileResult = CDP.CompileAssemblyFromFile(compilerParams, files);
} }
catch (Exception e) catch (Exception e)
{ {
Vocaluxe/Lib/Input/CHIDAPI.cs
+8 -8
View File
@@ -148,12 +148,12 @@ namespace Vocaluxe.Lib.Input
public static int ReadTimeout(IntPtr Device, out byte[] Data, int length, int milliseconds) public static int ReadTimeout(IntPtr Device, out byte[] Data, int length, int milliseconds)
{ {
Data = new byte[length]; Data = new byte[length];
IntPtr data = Marshal.AllocHGlobal(length); IntPtr dataPtr = Marshal.AllocHGlobal(length);
int result = -1; int result = -1;
try try
{ {
result = hid_read_timeout(Device, data, length, milliseconds); result = hid_read_timeout(Device, dataPtr, length, milliseconds);
} }
catch (Exception e) catch (Exception e)
{ {
@@ -162,11 +162,11 @@ namespace Vocaluxe.Lib.Input
} }
if (result != -1) if (result != -1)
Marshal.Copy(data, Data, 0, result); Marshal.Copy(dataPtr, Data, 0, result);
else else
Data = null; Data = null;
Marshal.FreeHGlobal(data); Marshal.FreeHGlobal(dataPtr);
return result; return result;
} }
@@ -176,12 +176,12 @@ namespace Vocaluxe.Lib.Input
public static int Read(IntPtr Device, out byte[] Data, int length) public static int Read(IntPtr Device, out byte[] Data, int length)
{ {
Data = new byte[length]; Data = new byte[length];
IntPtr data = Marshal.AllocHGlobal(length); IntPtr dataPtr = Marshal.AllocHGlobal(length);
int result = -1; int result = -1;
try try
{ {
result = hid_read(Device, data, length); result = hid_read(Device, dataPtr, length);
} }
catch (Exception e) catch (Exception e)
{ {
@@ -190,11 +190,11 @@ namespace Vocaluxe.Lib.Input
} }
if (result != -1) if (result != -1)
Marshal.Copy(data, Data, 0, result); Marshal.Copy(dataPtr, Data, 0, result);
else else
Data = null; Data = null;
Marshal.FreeHGlobal(data); Marshal.FreeHGlobal(dataPtr);
return result; return result;
} }
Vocaluxe/Lib/Sound/CDirectSoundRecord.cs
+12 -12
View File
@@ -250,7 +250,7 @@ namespace Vocaluxe.Lib.Sound
{ {
private volatile bool running; private volatile bool running;
private readonly int bufferSize; private readonly int bufferSize;
private CaptureBuffer buffer; private CaptureBuffer CaptureBuffer;
private CaptureBufferDescription bufferDescription; private CaptureBufferDescription bufferDescription;
private DirectSoundCapture captureDevice; private DirectSoundCapture captureDevice;
private readonly WaveFormat waveFormat; private readonly WaveFormat waveFormat;
@@ -310,9 +310,9 @@ namespace Vocaluxe.Lib.Sound
bufferDescription.Format = waveFormat; bufferDescription.Format = waveFormat;
bufferDescription.WaveMapped = false; bufferDescription.WaveMapped = false;
buffer = new CaptureBuffer(captureDevice, bufferDescription); CaptureBuffer = new CaptureBuffer(captureDevice, bufferDescription);
bufferPortionSize = buffer.SizeInBytes / bufferPortionCount; bufferPortionSize = CaptureBuffer.SizeInBytes / bufferPortionCount;
notifications = new List<NotificationPosition>(); notifications = new List<NotificationPosition>();
for (int i = 0; i < bufferPortionCount; i++) for (int i = 0; i < bufferPortionCount; i++)
@@ -323,13 +323,13 @@ namespace Vocaluxe.Lib.Sound
notifications.Add(notification); notifications.Add(notification);
} }
buffer.SetNotificationPositions(notifications.ToArray()); CaptureBuffer.SetNotificationPositions(notifications.ToArray());
waitHandles = new WaitHandle[notifications.Count]; waitHandles = new WaitHandle[notifications.Count];
for (int i = 0; i < notifications.Count; i++) for (int i = 0; i < notifications.Count; i++)
waitHandles[i] = notifications[i].Event; waitHandles[i] = notifications[i].Event;
captureThread = new Thread(CaptureThread); captureThread = new Thread(DoCapture);
captureThread.IsBackground = true; captureThread.IsBackground = true;
running = true; running = true;
@@ -346,10 +346,10 @@ namespace Vocaluxe.Lib.Sound
captureThread = null; captureThread = null;
} }
if (buffer != null) if (CaptureBuffer != null)
{ {
buffer.Dispose(); CaptureBuffer.Dispose();
buffer = null; CaptureBuffer = null;
} }
if (notifications != null) if (notifications != null)
@@ -368,7 +368,7 @@ namespace Vocaluxe.Lib.Sound
Start(); Start();
} }
private void CaptureThread() private void DoCapture()
{ {
int bufferPortionSamples = bufferPortionSize / sizeof(byte); int bufferPortionSamples = bufferPortionSize / sizeof(byte);
@@ -376,13 +376,13 @@ namespace Vocaluxe.Lib.Sound
byte[] bufferPortion = new byte[bufferPortionSamples]; byte[] bufferPortion = new byte[bufferPortionSamples];
int bufferPortionIndex; int bufferPortionIndex;
buffer.Start(true); CaptureBuffer.Start(true);
while (running) while (running)
{ {
bufferPortionIndex = WaitHandle.WaitAny(waitHandles); bufferPortionIndex = WaitHandle.WaitAny(waitHandles);
buffer.Read( CaptureBuffer.Read(
bufferPortion, bufferPortion,
0, 0,
bufferPortionSamples, bufferPortionSamples,
@@ -391,7 +391,7 @@ namespace Vocaluxe.Lib.Sound
SampleDataReady(this, new SampleDataEventArgs(bufferPortion, guid)); SampleDataReady(this, new SampleDataEventArgs(bufferPortion, guid));
} }
buffer.Stop(); CaptureBuffer.Stop();
} }
public void Dispose() public void Dispose()
Vocaluxe/Lib/Video/CVideoDecoderGstreamer.cs
+3 -3
View File
@@ -61,10 +61,10 @@ namespace Vocaluxe.Lib.Video
public bool GetFrame(int StreamID, ref STexture Frame, float Time, ref float VideoTime) public bool GetFrame(int StreamID, ref STexture Frame, float Time, ref float VideoTime)
{ {
ManagedFrame frame = CGstreamerVideoWrapper.GetFrame(StreamID, Time); ManagedFrame managedFrame = CGstreamerVideoWrapper.GetFrame(StreamID, Time);
VideoTime = frame.Videotime; VideoTime = managedFrame.Videotime;
UploadNewFrame(ref Frame, ref frame.buffer, frame.Width, frame.Height); UploadNewFrame(ref Frame, ref managedFrame.buffer, managedFrame.Width, managedFrame.Height);
return true; return true;
} }
Vocaluxe/Screens/CPopupScreenPlayerControl.cs
+7 -7
View File
@@ -27,15 +27,15 @@ namespace Vocaluxe.Screens
private const string ButtonToBackgroundVideo = "ButtonToBackgroundVideo"; private const string ButtonToBackgroundVideo = "ButtonToBackgroundVideo";
private const string TextCurrentSong = "TextCurrentSong"; private const string TextCurrentSong = "TextCurrentSong";
private bool _VideoPreview; private bool _VideoPreviewInt;
private bool VideoPreview private bool VideoPreview
{ {
get { return _VideoPreview; } get { return _VideoPreviewInt; }
set set
{ {
_VideoPreview = value; _VideoPreviewInt = value;
if (!_VideoPreview && !VideoBackground) if (!_VideoPreviewInt && !VideoBackground)
CBackgroundMusic.VideoEnabled = false; CBackgroundMusic.VideoEnabled = false;
else else
CBackgroundMusic.VideoEnabled = true; CBackgroundMusic.VideoEnabled = true;
@@ -52,7 +52,7 @@ namespace Vocaluxe.Screens
if (CConfig.VideosToBackground == EOffOn.TR_CONFIG_ON) if (CConfig.VideosToBackground == EOffOn.TR_CONFIG_ON)
{ {
CConfig.VideosToBackground = EOffOn.TR_CONFIG_OFF; CConfig.VideosToBackground = EOffOn.TR_CONFIG_OFF;
if (!_VideoPreview) if (!_VideoPreviewInt)
CBackgroundMusic.VideoEnabled = false; CBackgroundMusic.VideoEnabled = false;
} }
} }
@@ -165,9 +165,9 @@ namespace Vocaluxe.Screens
public override bool UpdateGame() public override bool UpdateGame()
{ {
Statics[StaticCover].Visible = !_VideoPreview || !CBackgroundMusic.SongHasVideo; Statics[StaticCover].Visible = !_VideoPreviewInt || !CBackgroundMusic.SongHasVideo;
Buttons[ButtonToBackgroundVideo].Pressed = VideoBackground; Buttons[ButtonToBackgroundVideo].Pressed = VideoBackground;
Buttons[ButtonShowVideo].Pressed = _VideoPreview; Buttons[ButtonShowVideo].Pressed = _VideoPreviewInt;
Buttons[ButtonRepeat].Pressed = CBackgroundMusic.RepeatSong; Buttons[ButtonRepeat].Pressed = CBackgroundMusic.RepeatSong;
Buttons[ButtonSing].Visible = CBackgroundMusic.CanSing && CParty.CurrentPartyModeID == -1; Buttons[ButtonSing].Visible = CBackgroundMusic.CanSing && CParty.CurrentPartyModeID == -1;
return true; return true;
VocaluxeLib/Menu/CMenu.cs
+8 -8
View File
@@ -463,9 +463,9 @@ namespace VocaluxeLib.Menu
return new CStatic(_PartyModeID); return new CStatic(_PartyModeID);
} }
public CStatic GetNewStatic(CStatic Static) public CStatic GetNewStatic(CStatic oldStatic)
{ {
return new CStatic(Static); return new CStatic(oldStatic);
} }
public CStatic GetNewStatic(STexture Texture, SColorF Color, SRectF Rect) public CStatic GetNewStatic(STexture Texture, SColorF Color, SRectF Rect)
@@ -1962,22 +1962,22 @@ namespace VocaluxeLib.Menu
} }
} }
private bool CheckVersion(int Version, CXMLReader xmlReader) private bool CheckVersion(int reqVersion, CXMLReader xmlReader)
{ {
int version = 0; int actualVersion = 0;
xmlReader.TryGetIntValue("//root/" + ThemeName + "/ScreenVersion", ref version); xmlReader.TryGetIntValue("//root/" + ThemeName + "/ScreenVersion", ref actualVersion);
if (version == Version) if (actualVersion == reqVersion)
return true; return true;
else else
{ {
string msg = "Can't load screen file of screen \"" + ThemeName + "\", "; string msg = "Can't load screen file of screen \"" + ThemeName + "\", ";
if (version < Version) if (actualVersion < reqVersion)
msg += "the file ist outdated! "; msg += "the file ist outdated! ";
else else
msg += "the file is for newer program versions! "; msg += "the file is for newer program versions! ";
msg += "Current screen version is " + Version.ToString(); msg += "Current screen version is " + reqVersion.ToString();
CBase.Log.LogError(msg); CBase.Log.LogError(msg);
} }
return false; return false;
VocaluxeLib/Menu/IMenu.cs
+13 -13
View File
@@ -810,17 +810,17 @@ namespace VocaluxeLib.Menu
{ {
private readonly SPlayer[,] _Rounds; private readonly SPlayer[,] _Rounds;
public CPoints(int NumRounds, SPlayer[] Player) public CPoints(int NumRounds, SPlayer[] Players)
{ {
_Rounds = new SPlayer[NumRounds,Player.Length]; _Rounds = new SPlayer[NumRounds,Players.Length];
for (int round = 0; round < NumRounds; round++) for (int round = 0; round < NumRounds; round++)
{ {
for (int player = 0; player < Player.Length; player++) for (int player = 0; player < Players.Length; player++)
{ {
_Rounds[round, player].ProfileID = Player[player].ProfileID; _Rounds[round, player].ProfileID = Players[player].ProfileID;
_Rounds[round, player].Name = Player[player].Name; _Rounds[round, player].Name = Players[player].Name;
_Rounds[round, player].Difficulty = Player[player].Difficulty; _Rounds[round, player].Difficulty = Players[player].Difficulty;
_Rounds[round, player].Points = 0f; _Rounds[round, player].Points = 0f;
_Rounds[round, player].PointsGoldenNotes = 0f; _Rounds[round, player].PointsGoldenNotes = 0f;
_Rounds[round, player].PointsLineBonus = 0f; _Rounds[round, player].PointsLineBonus = 0f;
@@ -832,21 +832,21 @@ namespace VocaluxeLib.Menu
} }
} }
public void SetPoints(int Round, int SongID, SPlayer[] Player, bool Medley, bool Duet, bool ShortSong) public void SetPoints(int Round, int SongID, SPlayer[] Players, bool Medley, bool Duet, bool ShortSong)
{ {
long DateTicks = DateTime.Now.Ticks; long DateTicks = DateTime.Now.Ticks;
for (int player = 0; player < Player.Length; player++) for (int player = 0; player < Players.Length; player++)
{ {
_Rounds[Round, player].SongID = SongID; _Rounds[Round, player].SongID = SongID;
_Rounds[Round, player].LineNr = Player[player].LineNr; _Rounds[Round, player].LineNr = Players[player].LineNr;
_Rounds[Round, player].Points = Player[player].Points; _Rounds[Round, player].Points = Players[player].Points;
_Rounds[Round, player].PointsGoldenNotes = Player[player].PointsGoldenNotes; _Rounds[Round, player].PointsGoldenNotes = Players[player].PointsGoldenNotes;
_Rounds[Round, player].PointsLineBonus = Player[player].PointsLineBonus; _Rounds[Round, player].PointsLineBonus = Players[player].PointsLineBonus;
_Rounds[Round, player].Medley = Medley; _Rounds[Round, player].Medley = Medley;
_Rounds[Round, player].Duet = Duet; _Rounds[Round, player].Duet = Duet;
_Rounds[Round, player].ShortSong = ShortSong; _Rounds[Round, player].ShortSong = ShortSong;
_Rounds[Round, player].DateTicks = DateTicks; _Rounds[Round, player].DateTicks = DateTicks;
_Rounds[Round, player].SongFinished = Player[player].SongFinished; _Rounds[Round, player].SongFinished = Players[player].SongFinished;
} }
} }
VocaluxeLib/Menu/SingNotes/CSingNotes.cs
+14 -14
View File
@@ -674,7 +674,7 @@ namespace VocaluxeLib.Menu.SingNotes
{ {
int TonePlayer = CBase.Record.GetToneAbs(_PlayerNotes[n].PlayerNr); int TonePlayer = CBase.Record.GetToneAbs(_PlayerNotes[n].PlayerNr);
SRectF Rect = _PlayerNotes[n].Rect; SRectF noteBounds = _PlayerNotes[n].Rect;
while (TonePlayer - BaseLine < 0) while (TonePlayer - BaseLine < 0)
TonePlayer += 12; TonePlayer += 12;
@@ -685,16 +685,16 @@ namespace VocaluxeLib.Menu.SingNotes
if (XOffset < 0f) if (XOffset < 0f)
XOffset = 0f; XOffset = 0f;
if (XOffset > Rect.W) if (XOffset > noteBounds.W)
XOffset = Rect.W; XOffset = noteBounds.W;
float dy = Rect.H / CBase.Settings.GetNumNoteLines(); float dy = noteBounds.H / CBase.Settings.GetNumNoteLines();
SRectF rect = new SRectF( SRectF drawRect = new SRectF(
Rect.X - dy + XOffset, noteBounds.X - dy + XOffset,
Rect.Y + dy * (CBase.Settings.GetNumNoteLines() - 1 - (TonePlayer - BaseLine) / 2f), noteBounds.Y + dy * (CBase.Settings.GetNumNoteLines() - 1 - (TonePlayer - BaseLine) / 2f),
dy, dy,
dy, dy,
Rect.Z noteBounds.Z
); );
SColorF color = new SColorF( SColorF color = new SColorF(
@@ -704,7 +704,7 @@ namespace VocaluxeLib.Menu.SingNotes
_PlayerNotes[n].Color.A * _PlayerNotes[n].Alpha); _PlayerNotes[n].Color.A * _PlayerNotes[n].Alpha);
STexture ToneHelper = CBase.Theme.GetSkinTexture(_Theme.SkinToneHelperName, _PartyModeID); STexture ToneHelper = CBase.Theme.GetSkinTexture(_Theme.SkinToneHelperName, _PartyModeID);
CBase.Drawing.DrawTexture(ToneHelper, rect, color); CBase.Drawing.DrawTexture(ToneHelper, drawRect, color);
while (TonePlayer - BaseLine < 12) while (TonePlayer - BaseLine < 12)
@@ -713,15 +713,15 @@ namespace VocaluxeLib.Menu.SingNotes
while (TonePlayer - BaseLine > 24) while (TonePlayer - BaseLine > 24)
TonePlayer -= 12; TonePlayer -= 12;
rect = new SRectF( drawRect = new SRectF(
Rect.X - dy + XOffset, noteBounds.X - dy + XOffset,
Rect.Y + dy * (CBase.Settings.GetNumNoteLines() - 1 - (TonePlayer - BaseLine) / 2f), noteBounds.Y + dy * (CBase.Settings.GetNumNoteLines() - 1 - (TonePlayer - BaseLine) / 2f),
dy, dy,
dy, dy,
Rect.Z noteBounds.Z
); );
CBase.Drawing.DrawTexture(ToneHelper, rect, color); CBase.Drawing.DrawTexture(ToneHelper, drawRect, color);
} }
#region ThemeEdit #region ThemeEdit