From 3a19fcfdbe33a85c92d2a0f0805e8582d764423e Mon Sep 17 00:00:00 2001 From: Stephan Sundermann Date: Sat, 31 Aug 2013 15:56:51 +0200 Subject: [PATCH 1/4] Update build to 0081 Added script to automatically compress and rar artifact --- Installer/buildportable.bat | 20 ++++++++++++++++++++ Installer/setup.aip | 2 +- Vocaluxe/Properties/AssemblyInfo.cs | 4 ++-- 3 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 Installer/buildportable.bat diff --git a/Installer/buildportable.bat b/Installer/buildportable.bat new file mode 100644 index 00000000..1b7aa978 --- /dev/null +++ b/Installer/buildportable.bat @@ -0,0 +1,20 @@ +@echo off +SET version=v0.3.0 +SET status=Beta +SET buildnum=0081 +SET buildname=Vocaluxe %version% %status% (%buildnum%).rar + +REM compile x64 +call "%VS110COMNTOOLS%\..\..\VC\vcvarsall.bat" x64 +devenv.com ..\Vocaluxe.sln /Rebuild "ReleaseWin|x64" + +REM remove old x64 executables if found and rename +if exist "..\Output\Vocaluxe_x64.exe" del "..\Output\Vocaluxe_x64.exe" +ren "..\Output\Vocaluxe.exe" "Vocaluxe_x64.exe" + +REM compile x86 +call "%VS110COMNTOOLS%\..\..\VC\vcvarsall.bat" x86 +devenv.com ..\Vocaluxe.sln /Rebuild "ReleaseWin|x86" + +REM package +rar a -r -ep1 -x..\Output\CoverDB.sqlite -x..\Output\HighscoreDB.sqlite -x..\Output\*.log -x..\Output\*.pdb -x..\Output\Config.xml -x..\Output\Vocaluxe.vshost* -x..\Output\Songs -x..\Output\Screenshots -x..\Output\Playlists "%buildname%" "..\Output\*" \ No newline at end of file diff --git a/Installer/setup.aip b/Installer/setup.aip index 0be02492..1c0a202f 100644 --- a/Installer/setup.aip +++ b/Installer/setup.aip @@ -25,7 +25,7 @@ - + diff --git a/Vocaluxe/Properties/AssemblyInfo.cs b/Vocaluxe/Properties/AssemblyInfo.cs index 533d944d..e9c48737 100644 --- a/Vocaluxe/Properties/AssemblyInfo.cs +++ b/Vocaluxe/Properties/AssemblyInfo.cs @@ -51,5 +51,5 @@ using System.Runtime.InteropServices; // Revision // -[assembly: AssemblyVersion("0.3.0.80")] -[assembly: AssemblyFileVersion("0.3.0.80")] \ No newline at end of file +[assembly: AssemblyVersion("0.3.0.81")] +[assembly: AssemblyFileVersion("0.3.0.81")] \ No newline at end of file From d144c497be26611218f5bf8d0dc9b6697bb40a88 Mon Sep 17 00:00:00 2001 From: Stephan Sundermann Date: Mon, 2 Sep 2013 01:34:17 +0200 Subject: [PATCH 2/4] Fixed uninstall routine --- Installer/Notes.txt | 3 --- Installer/setup.aip | 28 ++++++++++++++++++++++------ 2 files changed, 22 insertions(+), 9 deletions(-) delete mode 100644 Installer/Notes.txt diff --git a/Installer/Notes.txt b/Installer/Notes.txt deleted file mode 100644 index e753fe7e..00000000 --- a/Installer/Notes.txt +++ /dev/null @@ -1,3 +0,0 @@ -Needs advanced installer proffesional to compile - -Please add Advanced Installer to path before running build.bat \ No newline at end of file diff --git a/Installer/setup.aip b/Installer/setup.aip index 1c0a202f..21576c70 100644 --- a/Installer/setup.aip +++ b/Installer/setup.aip @@ -3,8 +3,8 @@ - - + + @@ -1501,7 +1501,12 @@ - + + + + + + @@ -1568,12 +1573,16 @@ + + + + @@ -1687,6 +1696,7 @@ + @@ -1736,13 +1746,14 @@ - + + @@ -1836,7 +1847,12 @@ - + + + + + + @@ -1866,6 +1882,6 @@ - + From 00660c8b689667a482005c28a48fa20da9999999 Mon Sep 17 00:00:00 2001 From: Alexander Eckart Date: Sat, 7 Sep 2013 15:45:04 +0200 Subject: [PATCH 3/4] use settings for xml writing --- Vocaluxe/Base/CConfig.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Vocaluxe/Base/CConfig.cs b/Vocaluxe/Base/CConfig.cs index 7a68bc66..2eed7474 100644 --- a/Vocaluxe/Base/CConfig.cs +++ b/Vocaluxe/Base/CConfig.cs @@ -304,7 +304,7 @@ namespace Vocaluxe.Base XmlWriter writer = null; try { - writer = XmlWriter.Create(Path.Combine(CSettings.DataPath, CSettings.FileConfig)); + writer = XmlWriter.Create(Path.Combine(CSettings.DataPath, CSettings.FileConfig), _Settings); writer.WriteStartDocument(); writer.WriteStartElement("root"); From 5245829557133d041e0224c0bcfff80269e80506 Mon Sep 17 00:00:00 2001 From: Stephan Sundermann Date: Sat, 14 Sep 2013 20:41:31 +0200 Subject: [PATCH 4/4] Fixed frames sometimes not showing up Better return true here, since there is a frame available which can be shown --- Vocaluxe/Lib/Video/Acinerella/CDecoder.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Vocaluxe/Lib/Video/Acinerella/CDecoder.cs b/Vocaluxe/Lib/Video/Acinerella/CDecoder.cs index 5ba37c91..84f591e1 100644 --- a/Vocaluxe/Lib/Video/Acinerella/CDecoder.cs +++ b/Vocaluxe/Lib/Video/Acinerella/CDecoder.cs @@ -130,7 +130,7 @@ namespace Vocaluxe.Lib.Video.Acinerella else { videoTime = 0; - return false; + return true; } _UploadNewFrame(ref frame); videoTime = _LastShownTime; @@ -438,4 +438,4 @@ namespace Vocaluxe.Lib.Video.Acinerella } #endregion Threading } -} \ No newline at end of file +}