From 342123dc4eed33145916dfe7e7a3bc7a89eb65aa Mon Sep 17 00:00:00 2001 From: lukeIam <2lukeiam@gmail.com> Date: Wed, 31 Jan 2018 20:34:11 +0100 Subject: [PATCH 01/14] Removed useless metapackage vocaluxe.dependencies (cherry picked from commit 20d13d9f0660b44db4614ae6e9dd6c17a3456980) # Conflicts: # Vocaluxe/packages.config --- Vocaluxe/Vocaluxe.csproj | 2 -- Vocaluxe/packages.config | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/Vocaluxe/Vocaluxe.csproj b/Vocaluxe/Vocaluxe.csproj index 248e7a46..a2f05409 100644 --- a/Vocaluxe/Vocaluxe.csproj +++ b/Vocaluxe/Vocaluxe.csproj @@ -547,7 +547,6 @@ - @@ -561,5 +560,4 @@ - \ No newline at end of file diff --git a/Vocaluxe/packages.config b/Vocaluxe/packages.config index 437d7321..b3c6953a 100644 --- a/Vocaluxe/packages.config +++ b/Vocaluxe/packages.config @@ -1,6 +1,6 @@  - + From 61dcfc3aeb86b959320232db633373f10e395fe8 Mon Sep 17 00:00:00 2001 From: lukeIam <2lukeiam@gmail.com> Date: Wed, 31 Jan 2018 20:42:25 +0100 Subject: [PATCH 02/14] Upgrade PortAudio to version pa_stable_v190600_20161030 (cherry picked from commit 16f9ef2c8861ce22b7e09aeae342f701739ce149) --- Vocaluxe/Vocaluxe.csproj | 7 ++++--- Vocaluxe/packages.config | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Vocaluxe/Vocaluxe.csproj b/Vocaluxe/Vocaluxe.csproj index a2f05409..7a145115 100644 --- a/Vocaluxe/Vocaluxe.csproj +++ b/Vocaluxe/Vocaluxe.csproj @@ -31,7 +31,8 @@ 1.0.0.%2a false true - 3d91144f + + x86 @@ -542,11 +543,11 @@ - + @@ -555,9 +556,9 @@ - + \ No newline at end of file diff --git a/Vocaluxe/packages.config b/Vocaluxe/packages.config index b3c6953a..493ebca1 100644 --- a/Vocaluxe/packages.config +++ b/Vocaluxe/packages.config @@ -9,7 +9,7 @@ - + From cd5ab37afd395bd55a0ffefd666b6821842ec1cf Mon Sep 17 00:00:00 2001 From: lukeIam <2lukeiam@gmail.com> Date: Tue, 27 Feb 2018 19:34:15 +0100 Subject: [PATCH 03/14] Use TLS 1.2 for downloading GStreamer (cherry picked from commit 617cf70bf8d7dc35abab1bf0c786d607809d2843) --- Vocaluxe/Vocaluxe.csproj | 4 ++-- Vocaluxe/packages.config | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Vocaluxe/Vocaluxe.csproj b/Vocaluxe/Vocaluxe.csproj index 7a145115..d7931ec1 100644 --- a/Vocaluxe/Vocaluxe.csproj +++ b/Vocaluxe/Vocaluxe.csproj @@ -546,7 +546,7 @@ - + @@ -559,6 +559,6 @@ - + \ No newline at end of file diff --git a/Vocaluxe/packages.config b/Vocaluxe/packages.config index 493ebca1..0dbfb55c 100644 --- a/Vocaluxe/packages.config +++ b/Vocaluxe/packages.config @@ -5,7 +5,7 @@ - + From 4c76c88074e1078004ff206804247a4b81a5cf0a Mon Sep 17 00:00:00 2001 From: Stefan Date: Wed, 15 Jan 2020 23:44:49 +0100 Subject: [PATCH 04/14] Fix release-0.4.1: Config.Video.VideoPreview is ignored (fixes #391) --- VocaluxeLib/Menu/SongMenu/CSongMenuList.cs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/VocaluxeLib/Menu/SongMenu/CSongMenuList.cs b/VocaluxeLib/Menu/SongMenu/CSongMenuList.cs index 8bbd810a..59741a1d 100644 --- a/VocaluxeLib/Menu/SongMenu/CSongMenuList.cs +++ b/VocaluxeLib/Menu/SongMenu/CSongMenuList.cs @@ -541,7 +541,9 @@ namespace VocaluxeLib.Menu.SongMenu } _TextBG.Draw(); - CTextureRef vidtex = CBase.BackgroundMusic.IsPlayingPreview() ? CBase.BackgroundMusic.GetVideoTexture() : null; + CTextureRef vidtex = null; + if (CBase.Config.GetVideoPreview() == EOffOn.TR_CONFIG_ON) + vidtex = (CBase.BackgroundMusic.IsPlayingPreview() ? CBase.BackgroundMusic.GetVideoTexture() : null); if (vidtex != null) { @@ -683,4 +685,4 @@ namespace VocaluxeLib.Menu.SongMenu base.LoadSkin(); } } -} \ No newline at end of file +} From e2dcbc2ecf86b54a61610344a292a2aa2795c474 Mon Sep 17 00:00:00 2001 From: Stefan Date: Wed, 15 Jan 2020 23:46:01 +0100 Subject: [PATCH 05/14] Fix release-0.4.1: Config.Video.VideoPreview is ignored (fixes #391) --- VocaluxeLib/Menu/SongMenu/CSongMenuTileBoard.cs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/VocaluxeLib/Menu/SongMenu/CSongMenuTileBoard.cs b/VocaluxeLib/Menu/SongMenu/CSongMenuTileBoard.cs index f74e81f9..7457ac52 100644 --- a/VocaluxeLib/Menu/SongMenu/CSongMenuTileBoard.cs +++ b/VocaluxeLib/Menu/SongMenu/CSongMenuTileBoard.cs @@ -515,7 +515,9 @@ namespace VocaluxeLib.Menu.SongMenu _TextBG.Draw(); - CTextureRef vidtex = CBase.BackgroundMusic.IsPlayingPreview() ? CBase.BackgroundMusic.GetVideoTexture() : null; + CTextureRef vidtex = null; + if (CBase.Config.GetVideoPreview() == EOffOn.TR_CONFIG_ON) + vidtex = (CBase.BackgroundMusic.IsPlayingPreview() ? CBase.BackgroundMusic.GetVideoTexture() : null); if (vidtex != null) { @@ -638,4 +640,4 @@ namespace VocaluxeLib.Menu.SongMenu Init(); } } -} \ No newline at end of file +} From 9e8952157ad8c922274a05ae27537130a83d9042 Mon Sep 17 00:00:00 2001 From: Stefan Date: Thu, 16 Jan 2020 07:15:23 +0100 Subject: [PATCH 06/14] Fix release-0.4.1: JumpTo not working correctly on folder sort (fix #449) --- Vocaluxe/Screens/CScreenSong.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Vocaluxe/Screens/CScreenSong.cs b/Vocaluxe/Screens/CScreenSong.cs index ad8c73d0..0b1fe528 100644 --- a/Vocaluxe/Screens/CScreenSong.cs +++ b/Vocaluxe/Screens/CScreenSong.cs @@ -1067,7 +1067,7 @@ namespace Vocaluxe.Screens case ESongSorting.TR_CONFIG_FOLDER: if (curSelected >= 0 && curSelected < ct - 1 && songs[curSelected].Folder.StartsWith(letter.ToString(), StringComparison.OrdinalIgnoreCase)) start = curSelected + 1; - visibleID = _FindIndex(songs, start, element => element.Folder.StartsWith(letter.ToString(), StringComparison.OrdinalIgnoreCase)); + visibleID = _FindIndex(songs, start, element => element.FolderName.StartsWith(letter.ToString(), StringComparison.OrdinalIgnoreCase)); break; } if (visibleID > -1) @@ -1380,4 +1380,4 @@ namespace Vocaluxe.Screens } #endregion Playlist Actions } -} \ No newline at end of file +} From cfc6bfa7384cff1d27af79ea458e5d59093d92ed Mon Sep 17 00:00:00 2001 From: Stefan Date: Tue, 4 Feb 2020 08:46:48 +0100 Subject: [PATCH 07/14] Relative song paths will now be converted to absolute song paths Same fix from GaryCXJk for release-0.4.1 --- Vocaluxe/Base/CConfig.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Vocaluxe/Base/CConfig.cs b/Vocaluxe/Base/CConfig.cs index 1b7fde8e..48d9805a 100644 --- a/Vocaluxe/Base/CConfig.cs +++ b/Vocaluxe/Base/CConfig.cs @@ -633,7 +633,7 @@ namespace Vocaluxe.Base { //Check if folder exists if (Directory.Exists(folder)) - SongFolders.Add(folder); + SongFolders.Add(Path.GetFullPath(folder)); } } @@ -803,4 +803,4 @@ namespace Vocaluxe.Base } } } -} \ No newline at end of file +} From 546ccf4748d7ec610d149d777bb78f851402a1c7 Mon Sep 17 00:00:00 2001 From: Stefan Date: Fri, 7 Feb 2020 21:17:36 +0100 Subject: [PATCH 08/14] Scroll offset was ignored while singing a single playlist song (fix #487 for release-0.4.1) --- VocaluxeLib/Menu/CPlaylist.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/VocaluxeLib/Menu/CPlaylist.cs b/VocaluxeLib/Menu/CPlaylist.cs index 96a411cb..89b32d7d 100644 --- a/VocaluxeLib/Menu/CPlaylist.cs +++ b/VocaluxeLib/Menu/CPlaylist.cs @@ -554,7 +554,7 @@ namespace VocaluxeLib.Menu break; case Keys.Enter: - _StartPlaylistSong(_CurrentPlaylistElement); + _StartPlaylistSong(_CurrentPlaylistElement + _Offset); break; case Keys.Add: //move the selected song up @@ -880,7 +880,7 @@ namespace VocaluxeLib.Menu //Start selected song with double click if (mouseEvent.LD && _CurrentPlaylistElement != -1) - _StartPlaylistSong(_CurrentPlaylistElement); + _StartPlaylistSong(_CurrentPlaylistElement + _Offset); //Change order with holding LB if (mouseEvent.LBH && _CurrentPlaylistElement != -1 && _PlaylistElementContents.Count > 0 && DragAndDropSongID == -1) @@ -1259,4 +1259,4 @@ namespace VocaluxeLib.Menu } #endregion ThemeEdit } -} \ No newline at end of file +} From 919ab803d141672f24492d73db6706873411efac Mon Sep 17 00:00:00 2001 From: Stefan Date: Sun, 9 Feb 2020 20:02:59 +0100 Subject: [PATCH 09/14] Fix alpha calculation for last sub line (release-0.4.1) Sub line was displayed wrong, if the last lyric line has a bigger distance to the second last line. Alpha calculation for sub lines stopped one line to early and might be visible even if it shouldn't be. --- Vocaluxe/Screens/CScreenSing.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Vocaluxe/Screens/CScreenSing.cs b/Vocaluxe/Screens/CScreenSing.cs index 4fdc3e76..0002ce6d 100644 --- a/Vocaluxe/Screens/CScreenSing.cs +++ b/Vocaluxe/Screens/CScreenSing.cs @@ -1114,7 +1114,7 @@ namespace Vocaluxe.Screens } // sub - if (currentLineSub < lines.Length - 2) + if ((currentLineSub + 1) < lines.Length) { float diff = CGame.GetTimeFromBeats(lines[currentLineSub + 1].FirstNoteBeat, song.BPM) - currentTime; @@ -1371,4 +1371,4 @@ namespace Vocaluxe.Screens } } } -} \ No newline at end of file +} From 5e481878f5499543ecd7ba41567cc80026cc1f00 Mon Sep 17 00:00:00 2001 From: Stefan Date: Tue, 11 Feb 2020 06:32:26 +0100 Subject: [PATCH 10/14] Update Readme.txt --- Output/Readme.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Output/Readme.txt b/Output/Readme.txt index 2cdffb4b..0c30e51d 100644 --- a/Output/Readme.txt +++ b/Output/Readme.txt @@ -1,4 +1,4 @@ -Vocaluxe 0.4 README +Vocaluxe 0.4.1 README ---------------------------- ================================= @@ -168,7 +168,6 @@ Vocaluxe Homepage: https://vocaluxe.org Bug Tracker: https://github.com/Vocaluxe/Vocaluxe/issues Translations: https://www.transifex.com/projects/p/vocaluxe/ GitHub Wiki: https://github.com/Vocaluxe/Vocaluxe/wiki -Support Forum (German): http://www.ultra-star.de Song-DataBase (USDB): http://usdb.animux.de/ From a6c576613882af8a1e3d5d7fd40612f2ff2a0938 Mon Sep 17 00:00:00 2001 From: lukeIam <2lukeiam@gmail.com> Date: Mon, 9 Mar 2020 18:24:20 +0100 Subject: [PATCH 11/14] Fix: replace invalid github tokens in 0.4.1 branch --- appveyor.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index a33b7eda..cc708f64 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -9,7 +9,7 @@ platform: clone_depth: 15 environment: GitHubKey: - secure: JSlN/em0JdspVn8jwaQ4IjugY6OQi0au4Qq0rhctJmcfGMaEGnUAOmDFULI48REW + secure: sGetWh2XUYs95VBT+QYNPtDW9Rh2/JBuxNNYXytpn7mMudUMcjSKDGErkCTum+ZE install: - ps: | $Env:CurrentCommitSha = "$(git rev-parse --verify HEAD)" @@ -88,7 +88,7 @@ deploy: release: $(APPVEYOR_REPO_TAG_NAME) description: $(APPVEYOR_REPO_COMMIT) auth_token: - secure: JSlN/em0JdspVn8jwaQ4IjugY6OQi0au4Qq0rhctJmcfGMaEGnUAOmDFULI48REW + secure: sGetWh2XUYs95VBT+QYNPtDW9Rh2/JBuxNNYXytpn7mMudUMcjSKDGErkCTum+ZE artifact: ReleaseZip prerelease: $(IS_BETA_RELEASE) on: @@ -100,7 +100,7 @@ deploy: release: Latest Nightly build description: $(APPVEYOR_REPO_COMMIT) auth_token: - secure: JSlN/em0JdspVn8jwaQ4IjugY6OQi0au4Qq0rhctJmcfGMaEGnUAOmDFULI48REW + secure: sGetWh2XUYs95VBT+QYNPtDW9Rh2/JBuxNNYXytpn7mMudUMcjSKDGErkCTum+ZE artifact: ReleaseZip prerelease: true on: From f550a22740c7d15fab48993e4033844eff22d9ce Mon Sep 17 00:00:00 2001 From: Florian Ostertag Date: Thu, 30 Mar 2023 11:03:04 +0200 Subject: [PATCH 12/14] Change: Default encoding to UTF-8 without bom --- VocaluxeLib/Songs/CSong.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VocaluxeLib/Songs/CSong.cs b/VocaluxeLib/Songs/CSong.cs index 46fe2267..ae93a16c 100644 --- a/VocaluxeLib/Songs/CSong.cs +++ b/VocaluxeLib/Songs/CSong.cs @@ -88,7 +88,7 @@ namespace VocaluxeLib.Songs public SShortEnd ShortEnd; - public Encoding Encoding = Encoding.Default; + public Encoding Encoding = UTF8Encoding.UTF8Encoding(); public bool ManualEncoding; public string Folder = String.Empty; public string FolderName = String.Empty; From 8bd55b3ef2978b56f9b5f618deb19bdad5b90177 Mon Sep 17 00:00:00 2001 From: Florian Ostertag Date: Thu, 30 Mar 2023 11:18:34 +0200 Subject: [PATCH 13/14] Fix: Syntax error --- VocaluxeLib/Songs/CSong.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VocaluxeLib/Songs/CSong.cs b/VocaluxeLib/Songs/CSong.cs index ae93a16c..993ad6c9 100644 --- a/VocaluxeLib/Songs/CSong.cs +++ b/VocaluxeLib/Songs/CSong.cs @@ -88,7 +88,7 @@ namespace VocaluxeLib.Songs public SShortEnd ShortEnd; - public Encoding Encoding = UTF8Encoding.UTF8Encoding(); + public Encoding Encoding = new UTF8Encoding(); public bool ManualEncoding; public string Folder = String.Empty; public string FolderName = String.Empty; From 90a0d775867503815faff7642ddae71692d54827 Mon Sep 17 00:00:00 2001 From: Florian Ostertag Date: Thu, 23 Nov 2023 14:06:08 +0100 Subject: [PATCH 14/14] #642: Implemented reading of tags --- Vocaluxe/Base/CCover.cs | 2 ++ Vocaluxe/Base/CSongCategorizer.cs | 3 +++ Vocaluxe/Base/CSongSorter.cs | 3 +++ VocaluxeLib/Enums.cs | 2 ++ VocaluxeLib/Songs/CSong.cs | 2 ++ VocaluxeLib/Songs/CSongLoader.cs | 6 ++++++ VocaluxeLib/Songs/CSongWriter.cs | 1 + 7 files changed, 19 insertions(+) diff --git a/Vocaluxe/Base/CCover.cs b/Vocaluxe/Base/CCover.cs index 0a155740..e19484e0 100644 --- a/Vocaluxe/Base/CCover.cs +++ b/Vocaluxe/Base/CCover.cs @@ -246,6 +246,8 @@ namespace Vocaluxe.Base return ECoverGeneratorType.Edition; case ESongSorting.TR_CONFIG_GENRE: return ECoverGeneratorType.Genre; + case ESongSorting.TR_CONFIG_TAGS: + return ECoverGeneratorType.Tags; case ESongSorting.TR_CONFIG_LANGUAGE: return ECoverGeneratorType.Language; case ESongSorting.TR_CONFIG_YEAR: diff --git a/Vocaluxe/Base/CSongCategorizer.cs b/Vocaluxe/Base/CSongCategorizer.cs index 05a9dba4..860ecc07 100644 --- a/Vocaluxe/Base/CSongCategorizer.cs +++ b/Vocaluxe/Base/CSongCategorizer.cs @@ -142,6 +142,9 @@ namespace Vocaluxe.Base case ESongSorting.TR_CONFIG_GENRE: noCategoryName = CLanguage.Translate("TR_SCREENSONG_NOGENRE"); break; + case ESongSorting.TR_CONFIG_TAGS: + noCategoryName = CLanguage.Translate("TR_SCEENSONG_NOTAGS"); + break; case ESongSorting.TR_CONFIG_LANGUAGE: noCategoryName = CLanguage.Translate("TR_SCREENSONG_NOLANGUAGE"); break; diff --git a/Vocaluxe/Base/CSongSorter.cs b/Vocaluxe/Base/CSongSorter.cs index 8a956107..53c02fae 100644 --- a/Vocaluxe/Base/CSongSorter.cs +++ b/Vocaluxe/Base/CSongSorter.cs @@ -136,6 +136,9 @@ namespace Vocaluxe.Base case ESongSorting.TR_CONFIG_GENRE: values = song.Genres; break; + case ESongSorting.TR_CONFIG_TAGS: + values = song.Tags; + break; case ESongSorting.TR_CONFIG_LANGUAGE: values = song.Languages; break; diff --git a/VocaluxeLib/Enums.cs b/VocaluxeLib/Enums.cs index 39e8399f..1de6327d 100644 --- a/VocaluxeLib/Enums.cs +++ b/VocaluxeLib/Enums.cs @@ -28,6 +28,7 @@ namespace VocaluxeLib Letter, Edition, Genre, + Tags, Language, Year, Decade, @@ -224,6 +225,7 @@ namespace VocaluxeLib TR_CONFIG_TITLE_LETTER, TR_CONFIG_EDITION, TR_CONFIG_GENRE, + TR_CONFIG_TAGS, TR_CONFIG_LANGUAGE, TR_CONFIG_YEAR, TR_CONFIG_DECADE, diff --git a/VocaluxeLib/Songs/CSong.cs b/VocaluxeLib/Songs/CSong.cs index 993ad6c9..50310f5e 100644 --- a/VocaluxeLib/Songs/CSong.cs +++ b/VocaluxeLib/Songs/CSong.cs @@ -167,6 +167,7 @@ namespace VocaluxeLib.Songs public readonly List Editions = new List(); public readonly List Genres = new List(); + public readonly List Tags = new List(); public string Album = ""; public string Year = ""; @@ -261,6 +262,7 @@ namespace VocaluxeLib.Songs Editions = new List(song.Editions); Genres = new List(song.Genres); + Tags = new List(song.Tags); Album = song.Album; Year = song.Year; diff --git a/VocaluxeLib/Songs/CSongLoader.cs b/VocaluxeLib/Songs/CSongLoader.cs index b2374e1d..92a21a72 100644 --- a/VocaluxeLib/Songs/CSongLoader.cs +++ b/VocaluxeLib/Songs/CSongLoader.cs @@ -228,6 +228,12 @@ namespace VocaluxeLib.Songs else _LogWarning("Invalid genre"); break; + case "TAGS": + if (value.Length > 1) + _Song.Tags.AddRange(value.Split(',')); + else + _LogWarning("Invalid tags"); + break; case "ALBUM": _Song.Album = value; break; diff --git a/VocaluxeLib/Songs/CSongWriter.cs b/VocaluxeLib/Songs/CSongWriter.cs index 7d5eb4ca..e0c97031 100644 --- a/VocaluxeLib/Songs/CSongWriter.cs +++ b/VocaluxeLib/Songs/CSongWriter.cs @@ -87,6 +87,7 @@ namespace VocaluxeLib.Songs _WriteHeaderEntry("ARTIST-ON-SORTING", _Song.ArtistSorting); _WriteHeaderEntrys("EDITION", _Song.Editions); _WriteHeaderEntrys("GENRE", _Song.Genres); + _WriteHeaderEntry("TAGS", String.Join(",", _Song.Tags.ToArray())); _WriteHeaderEntrys("LANGUAGE", _Song.Languages); _WriteHeaderEntry("ALBUM", _Song.Album); _WriteHeaderEntry("YEAR", _Song.Year);