diff --git a/.gitignore b/.gitignore
index cd58e0f8..ca5aa552 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,6 +20,7 @@ Output/Songs
*.log
/Output/Playlists/*.xml
/Output/x64/gstreamer/GstreamerHelper.dll
+/Output/x86/gstreamer/GstreamerHelper.dll
*.tlog
*.suo
*.obj
@@ -35,6 +36,6 @@ Output/Songs
*.nativecodeanalysis*
*.lastcodeanalysissucceeded
/PartyModes/*/*/*.dll
-
*.Cache
-/Output/x86/gstreamer/GstreamerHelper.dll
+/GstreamerHelper/bin/*
+/VocaluxeLib/bin
diff --git a/GstreamerHelper/GstreamerHelper.vcxproj b/GstreamerHelper/GstreamerHelper.vcxproj
index 42933149..d6ef40c8 100644
--- a/GstreamerHelper/GstreamerHelper.vcxproj
+++ b/GstreamerHelper/GstreamerHelper.vcxproj
@@ -39,14 +39,14 @@
DynamicLibrary
false
- v110
+ v110_xp
true
Unicode
DynamicLibrary
false
- v110
+ v110_xp
true
Unicode
@@ -67,29 +67,35 @@
- true
- ..\Output\x86\gstreamer\
+
+
+ bin\$(Configuration).$(Platform)\
$(MSBuildProjectDirectory)\x86\lib\glib-2.0\include;$(MSBuildProjectDirectory)\x86\include\gstreamer-1.0;$(MSBuildProjectDirectory)\x86\include\glib-2.0;$(MSBuildProjectDirectory)\x86\include;$(IncludePath)
$(MSBuildProjectDirectory)\x86\lib;$(LibraryPath)
+ true
+ obj\$(Configuration).$(Platform)\
true
- ..\Output\x64\gstreamer\
+ bin\$(Configuration).$(Platform)\
$(MSBuildProjectDirectory)\x64\lib\glib-2.0\include;$(MSBuildProjectDirectory)\x64\include\gstreamer-1.0;$(MSBuildProjectDirectory)\x64\include\glib-2.0;$(MSBuildProjectDirectory)\x64\include;$(IncludePath)
$(MSBuildProjectDirectory)\x64\lib;$(LibraryPath)
..\CheckingRules.ruleset
+ obj\$(Configuration).$(Platform)\
false
- ..\Output\x86\gstreamer\
+ bin\$(Configuration).$(Platform)\
$(MSBuildProjectDirectory)\x86\lib\glib-2.0\include;$(MSBuildProjectDirectory)\x86\include\gstreamer-1.0;$(MSBuildProjectDirectory)\x86\include\glib-2.0;$(MSBuildProjectDirectory)\x86\include;$(IncludePath)
$(MSBuildProjectDirectory)\x86\lib;$(LibraryPath)
+ obj\$(Configuration).$(Platform)\
false
- ..\Output\x64\gstreamer\
+ bin\$(Configuration).$(Platform)\
$(MSBuildProjectDirectory)\x64\lib\glib-2.0\include;$(MSBuildProjectDirectory)\x64\include\gstreamer-1.0;$(MSBuildProjectDirectory)\x64\include\glib-2.0;$(MSBuildProjectDirectory)\x64\include;$(IncludePath)
$(MSBuildProjectDirectory)\x64\lib;$(LibraryPath)
+ obj\$(Configuration).$(Platform)\
..\Output\x86
@@ -111,6 +117,12 @@
true
gstreamer-1.0.lib;gstcontroller-1.0.lib;gobject-2.0.lib;glib-2.0.lib;gstapp-1.0.lib;%(AdditionalDependencies)
+
+ xcopy "$(OutDir)*.dll" "$(SolutionDir)Output\x86\gstreamer\" /I /Y
+
+
+ Copying binary
+
@@ -125,6 +137,9 @@
true
gstreamer-1.0.lib;gstcontroller-1.0.lib;gobject-2.0.lib;glib-2.0.lib;gstapp-1.0.lib;%(AdditionalDependencies)
+
+ xcopy "$(OutDir)*.dll" "$(SolutionDir)Output\x64\gstreamer\" /I /Y
+
@@ -138,12 +153,18 @@
Windows
- true
+ false
true
true
gstreamer-1.0.lib;gstcontroller-1.0.lib;gobject-2.0.lib;glib-2.0.lib;gstapp-1.0.lib;%(AdditionalDependencies)
false
+
+ xcopy "$(OutDir)*.dll" "$(SolutionDir)Output\x86\gstreamer\" /I /Y
+
+
+ Copying binary
+
@@ -159,11 +180,14 @@
Windows
- true
+ false
true
true
gstreamer-1.0.lib;gstcontroller-1.0.lib;gobject-2.0.lib;glib-2.0.lib;gstapp-1.0.lib;%(AdditionalDependencies)
+
+ xcopy "$(OutDir)*.dll" "$(SolutionDir)Output\x64\gstreamer\" /I /Y
+
diff --git a/Output/Themes/Ambient/Screens/ScreenOptionsLyrics.xml b/Output/Themes/Ambient/Screens/ScreenOptionsLyrics.xml
index 72cd3bdb..0276de59 100644
--- a/Output/Themes/Ambient/Screens/ScreenOptionsLyrics.xml
+++ b/Output/Themes/Ambient/Screens/ScreenOptionsLyrics.xml
@@ -1,7 +1,7 @@
- 1
+ 2
Video
@@ -111,7 +111,7 @@
Outline
- TR_SCREENOLYRICS_ONTOP
+ TR_SCREENOLYRICS_POSITION
@@ -240,7 +240,7 @@
4
-
+
Invisible
@@ -306,6 +306,6 @@
Bold
2
-
+
-
\ No newline at end of file
+
diff --git a/Output/Themes/Ambient/Screens/ScreenOptionsRecord.xml b/Output/Themes/Ambient/Screens/ScreenOptionsRecord.xml
index 4692b664..9362f766 100644
--- a/Output/Themes/Ambient/Screens/ScreenOptionsRecord.xml
+++ b/Output/Themes/Ambient/Screens/ScreenOptionsRecord.xml
@@ -1,7 +1,7 @@
- 2
+ 3
Video
@@ -216,35 +216,6 @@
-
- 75
- 165
-
- 0,00
-
- 32
-
-
-
- StaticColor
-
-
- TextSColor
-
- Left
-
- Center
-
-
-
- Outline
-
- TR_SCREENORECORD_INPUT
-
-
-
-
-
75
225
@@ -272,8 +243,8 @@
-
-
+
+
75
285
@@ -301,8 +272,8 @@
-
-
+
+
75
345
@@ -330,7 +301,7 @@
-
+
640
@@ -600,73 +571,6 @@
1
-
-
- Invisible
-
- SelectSlideArrowLeft
-
- SelectSlideArrowRight
-
- SelectSlide
-
- SelectSlideArrowLeft
-
- SelectSlideArrowRight
-
- SelectSlide
-
- 500
- 160
- 0,00
- 700
- 50
-
- 505
- 165
- 0,00
- 40
- 40
-
- 1170
- 165
- 0,00
- 40
- 40
-
-
- SelectSlideColor
-
-
- SelectSlideSColor
-
-
- SelectSlideHColor
-
-
- ArrowColor
-
-
- ArrowSColor
-
-
- TextColor
-
-
- TextSColor
-
- 32,00
-
-
-
- 616,00
-
- Outline
-
- Bold
-
- 1
-
Invisible
diff --git a/Output/Themes/Changelog/Changelog_ScreenOptionsLyrics.txt b/Output/Themes/Changelog/Changelog_ScreenOptionsLyrics.txt
index 8af47a1e..2c584a57 100644
--- a/Output/Themes/Changelog/Changelog_ScreenOptionsLyrics.txt
+++ b/Output/Themes/Changelog/Changelog_ScreenOptionsLyrics.txt
@@ -1,5 +1,7 @@
ScreenOptionsSound
-
+++++++++++
+Version 2:
+Rename to
++++++++++
Version 1:
diff --git a/PartyModes/PartyModeChallenge/CPartyModeChallenge.cs b/PartyModes/PartyModeChallenge/CPartyModeChallenge.cs
index 5782df18..29ca14c1 100644
--- a/PartyModes/PartyModeChallenge/CPartyModeChallenge.cs
+++ b/PartyModes/PartyModeChallenge/CPartyModeChallenge.cs
@@ -308,7 +308,7 @@ namespace VocaluxeLib.PartyModes.Challenge
_Screens.TryGetValue("CPartyScreenChallengeMain", out screen);
if (screen != null)
{
- CBase.Songs.ResetPartySongSung();
+ CBase.Songs.ResetSongSung();
_ToScreenMain.ResultTable = new List();
_GameData.ResultTable = new List();
_GameData.Rounds = new CChallengeRounds(_GameData.NumRounds, _GameData.NumPlayer, _GameData.NumPlayerAtOnce);
@@ -459,11 +459,11 @@ namespace VocaluxeLib.PartyModes.Challenge
CBase.Game.AddSong(songID, gm);
CBase.Game.SetNumPlayer(_GameData.NumPlayerAtOnce);
- SPlayer[] player = CBase.Game.GetPlayers();
- if (player == null)
+ SPlayer[] players = CBase.Game.GetPlayers();
+ if (players == null)
return;
- if (player.Length < _GameData.NumPlayerAtOnce)
+ if (players.Length < _GameData.NumPlayerAtOnce)
return;
CCombination c = _GameData.Rounds.GetRound(_GameData.CurrentRoundNr - 1);
@@ -472,9 +472,9 @@ namespace VocaluxeLib.PartyModes.Challenge
{
//try to fill with the right data
if (c != null)
- player[i].ProfileID = _GameData.ProfileIDs[c.Player[i]];
+ players[i].ProfileID = _GameData.ProfileIDs[c.Player[i]];
else
- player[i].ProfileID = -1;
+ players[i].ProfileID = -1;
}
CBase.Songs.AddPartySongSung(songID);
diff --git a/PartyModes/PartyModeChallenge/CPartyScreenChallengeMain.cs b/PartyModes/PartyModeChallenge/CPartyScreenChallengeMain.cs
index 85730d80..21a40bc0 100644
--- a/PartyModes/PartyModeChallenge/CPartyScreenChallengeMain.cs
+++ b/PartyModes/PartyModeChallenge/CPartyScreenChallengeMain.cs
@@ -504,7 +504,9 @@ namespace VocaluxeLib.PartyModes.Challenge
_RoundsTable[i].Number.Text = (i + 1 + _RoundsTableOffset) + ")";
int pID = _GameState.ProfileIDs[_GameState.Combs[i + _RoundsTableOffset].Player[p]];
_RoundsTable[i].TextPlayer[p].Text = profile[pID].PlayerName;
+ // ReSharper disable ConvertIfStatementToConditionalTernaryExpression
if ((_GameState.CurrentRoundNr - 1) > i + _RoundsTableOffset)
+ // ReSharper restore ConvertIfStatementToConditionalTernaryExpression
_RoundsTable[i].TextScores[p].Text = _GameState.Results[i + _RoundsTableOffset, p].ToString();
else
_RoundsTable[i].TextScores[p].Text = "";
diff --git a/PartyModes/PartyModeChallenge/PartyModeChallenge.csproj b/PartyModes/PartyModeChallenge/PartyModeChallenge.csproj
index 571ceefc..4623278b 100644
--- a/PartyModes/PartyModeChallenge/PartyModeChallenge.csproj
+++ b/PartyModes/PartyModeChallenge/PartyModeChallenge.csproj
@@ -130,7 +130,8 @@
- cd $(SolutionDir)Partymodes\
+ if exist "$(SolutionDir)Output\PartyModes\$(TargetName)\Code" rd "$(SolutionDir)Output\PartyModes\$(TargetName)\Code" /S /Q
+cd $(SolutionDir)Partymodes\
xcopy "$(ProjectDir)*.cs" "$(SolutionDir)Output\PartyModes\$(TargetName)\Code\" /EXCLUDE:Excludes.txt /I /Y