From 3640189c12d0f9c8e0b0c0218f2bd611ade4a418 Mon Sep 17 00:00:00 2001 From: Aptivi Date: Mon, 7 Oct 2024 11:46:37 +0300 Subject: [PATCH] upd - Updated libraries --- Type: upd Breaking: False Doc Required: False Backport Required: False Part: 1/1 --- BassBoom.Basolia/BassBoom.Basolia.csproj | 4 ++-- BassBoom.Cli/BassBoom.Cli.csproj | 2 +- BassBoom.Cli/CliBase/Common.cs | 8 ++++---- BassBoom.Cli/CliBase/Equalizer.cs | 6 +++--- BassBoom.Cli/CliBase/Player.cs | 8 ++++---- BassBoom.Cli/CliBase/PlayerControls.cs | 20 ++++++++++---------- BassBoom.Cli/CliBase/Radio.cs | 8 ++++---- BassBoom.Cli/CliBase/RadioControls.cs | 10 +++++----- 8 files changed, 33 insertions(+), 33 deletions(-) diff --git a/BassBoom.Basolia/BassBoom.Basolia.csproj b/BassBoom.Basolia/BassBoom.Basolia.csproj index c2dd698..0661abe 100644 --- a/BassBoom.Basolia/BassBoom.Basolia.csproj +++ b/BassBoom.Basolia/BassBoom.Basolia.csproj @@ -28,10 +28,10 @@ - + - + diff --git a/BassBoom.Cli/BassBoom.Cli.csproj b/BassBoom.Cli/BassBoom.Cli.csproj index e9a1444..edea96d 100644 --- a/BassBoom.Cli/BassBoom.Cli.csproj +++ b/BassBoom.Cli/BassBoom.Cli.csproj @@ -7,7 +7,7 @@ - + diff --git a/BassBoom.Cli/CliBase/Common.cs b/BassBoom.Cli/CliBase/Common.cs index 6dcd5dc..ddb384a 100644 --- a/BassBoom.Cli/CliBase/Common.cs +++ b/BassBoom.Cli/CliBase/Common.cs @@ -125,7 +125,7 @@ internal static void ShowDeviceDriver() continue; } } - InfoBoxColor.WriteInfoBox( + InfoBoxModalColor.WriteInfoBoxModal( $$""" Device and Driver ================= @@ -221,7 +221,7 @@ Buffer info """); } - InfoBoxColor.WriteInfoBox( + InfoBoxModalColor.WriteInfoBoxModal( $$""" BassBoom specifications ======================= @@ -244,14 +244,14 @@ System specifications internal static void ShowHelp() { - InfoBoxColor.WriteInfoBox("Available keystrokes", + InfoBoxModalColor.WriteInfoBoxModal("Available keystrokes", KeybindingsWriter.RenderKeybindingHelpText(Player.allBindings) ); } internal static void ShowHelpRadio() { - InfoBoxColor.WriteInfoBox("Available keystrokes", + InfoBoxModalColor.WriteInfoBoxModal("Available keystrokes", KeybindingsWriter.RenderKeybindingHelpText(Radio.allBindings) ); } diff --git a/BassBoom.Cli/CliBase/Equalizer.cs b/BassBoom.Cli/CliBase/Equalizer.cs index 92431dd..b5b4034 100644 --- a/BassBoom.Cli/CliBase/Equalizer.cs +++ b/BassBoom.Cli/CliBase/Equalizer.cs @@ -70,15 +70,15 @@ internal static void OpenEqualizer(Screen screen) } catch (BasoliaException bex) { - InfoBoxColor.WriteInfoBox("There's an error with Basolia when trying to process the equalizer operation.\n\n" + bex.Message); + InfoBoxModalColor.WriteInfoBoxModal("There's an error with Basolia when trying to process the equalizer operation.\n\n" + bex.Message); } catch (BasoliaOutException bex) { - InfoBoxColor.WriteInfoBox("There's an error with Basolia output when trying to process the equalizer operation.\n\n" + bex.Message); + InfoBoxModalColor.WriteInfoBoxModal("There's an error with Basolia output when trying to process the equalizer operation.\n\n" + bex.Message); } catch (Exception ex) { - InfoBoxColor.WriteInfoBox("There's an unknown error when trying to process the equalizer operation.\n\n" + ex.Message); + InfoBoxModalColor.WriteInfoBoxModal("There's an unknown error when trying to process the equalizer operation.\n\n" + ex.Message); } } diff --git a/BassBoom.Cli/CliBase/Player.cs b/BassBoom.Cli/CliBase/Player.cs index 0f3d105..c6dfe40 100644 --- a/BassBoom.Cli/CliBase/Player.cs +++ b/BassBoom.Cli/CliBase/Player.cs @@ -167,21 +167,21 @@ public static void PlayerLoop() { if (PlaybackTools.IsPlaying(BassBoomCli.basolia)) PlaybackTools.Stop(BassBoomCli.basolia); - InfoBoxColor.WriteInfoBox("There's an error with Basolia when trying to process the music file.\n\n" + bex.Message); + InfoBoxModalColor.WriteInfoBoxModal("There's an error with Basolia when trying to process the music file.\n\n" + bex.Message); playerScreen.RequireRefresh(); } catch (BasoliaOutException bex) { if (PlaybackTools.IsPlaying(BassBoomCli.basolia)) PlaybackTools.Stop(BassBoomCli.basolia); - InfoBoxColor.WriteInfoBox("There's an error with Basolia output when trying to process the music file.\n\n" + bex.Message); + InfoBoxModalColor.WriteInfoBoxModal("There's an error with Basolia output when trying to process the music file.\n\n" + bex.Message); playerScreen.RequireRefresh(); } catch (Exception ex) { if (PlaybackTools.IsPlaying(BassBoomCli.basolia)) PlaybackTools.Stop(BassBoomCli.basolia); - InfoBoxColor.WriteInfoBox("There's an unknown error when trying to process the music file.\n\n" + ex.Message); + InfoBoxModalColor.WriteInfoBoxModal("There's an unknown error when trying to process the music file.\n\n" + ex.Message); playerScreen.RequireRefresh(); } } @@ -379,7 +379,7 @@ private static void HandlePlay() } catch (Exception ex) { - InfoBoxColor.WriteInfoBox($"Playback failure: {ex.Message}"); + InfoBoxModalColor.WriteInfoBoxModal($"Playback failure: {ex.Message}"); Common.failedToPlay = true; } } diff --git a/BassBoom.Cli/CliBase/PlayerControls.cs b/BassBoom.Cli/CliBase/PlayerControls.cs index 6297dc4..b48bbf8 100644 --- a/BassBoom.Cli/CliBase/PlayerControls.cs +++ b/BassBoom.Cli/CliBase/PlayerControls.cs @@ -235,7 +235,7 @@ internal static void PromptForAddSong() PlaybackPositioningTools.SeekToFrame(BassBoomCli.basolia, currentPos); } else - InfoBoxColor.WriteInfoBox($"File \"{path}\" doesn't exist."); + InfoBoxModalColor.WriteInfoBoxModal($"File \"{path}\" doesn't exist."); } internal static void PromptForAddSongs() @@ -263,7 +263,7 @@ internal static void PromptForAddSongs() } } else - InfoBoxColor.WriteInfoBox("Music playlist is not found."); + InfoBoxModalColor.WriteInfoBoxModal("Music playlist is not found."); } internal static void PromptForAddDirectory() @@ -287,7 +287,7 @@ internal static void PromptForAddDirectory() } } else - InfoBoxColor.WriteInfoBox("Music library directory is not found."); + InfoBoxModalColor.WriteInfoBoxModal("Music library directory is not found."); } internal static void PopulateMusicFileInfo(string musicPath) @@ -300,7 +300,7 @@ internal static void PopulateMusicFileInfo(string musicPath) if (!Common.cachedInfos.Any((csi) => csi.MusicPath == musicPath)) { ScreenTools.CurrentScreen?.RequireRefresh(); - InfoBoxColor.WriteInfoBox($"Opening {musicPath}...", false); + InfoBoxNonModalColor.WriteInfoBox($"Opening {musicPath}...", false); var total = AudioInfoTools.GetDuration(BassBoomCli.basolia, true); var formatInfo = FormatTools.GetFormatInfo(BassBoomCli.basolia); var frameInfo = AudioInfoTools.GetFrameInfo(BassBoomCli.basolia); @@ -369,7 +369,7 @@ internal static (string musicName, string musicArtist, string musicGenre) GetMus string lyricsPath = Path.GetDirectoryName(musicPath) + "/" + Path.GetFileNameWithoutExtension(musicPath) + ".lrc"; try { - InfoBoxColor.WriteInfoBox($"Trying to open lyrics file {lyricsPath}...", false); + InfoBoxNonModalColor.WriteInfoBox($"Trying to open lyrics file {lyricsPath}...", false); if (File.Exists(lyricsPath)) return LyricReader.GetLyrics(lyricsPath); else @@ -377,7 +377,7 @@ internal static (string musicName, string musicArtist, string musicGenre) GetMus } catch (Exception ex) { - InfoBoxColor.WriteInfoBox($"Can't open lyrics file {lyricsPath}... {ex.Message}"); + InfoBoxModalColor.WriteInfoBoxModal($"Can't open lyrics file {lyricsPath}... {ex.Message}"); } return null; } @@ -436,7 +436,7 @@ internal static void PlayTest() return; // Ignore all settings while playing test sound, because it IS a test session. - InfoBoxColor.WriteInfoBox("Playing test sound...", false); + InfoBoxNonModalColor.WriteInfoBox("Playing test sound...", false); // Extract the test sound asset to a temporary file string path = PlatformHelper.IsOnWindows() ? $"{Environment.GetEnvironmentVariable("TEMP")}" : $"/tmp/"; @@ -456,9 +456,9 @@ internal static void PlayTest() // Ask the user if everything is OK. int answer = InfoBoxButtonsColor.WriteInfoBoxButtons("Sound test", [new InputChoiceInfo("Yes", "Yes"), new InputChoiceInfo("No", "No")], "Is everything OK in this current configuration?"); if (answer == 0) - InfoBoxColor.WriteInfoBox("Congratulations! You've set up everything properly!"); + InfoBoxModalColor.WriteInfoBoxModal("Congratulations! You've set up everything properly!"); else if (answer == 1) - InfoBoxColor.WriteInfoBox("Check your device and try again."); + InfoBoxModalColor.WriteInfoBoxModal("Check your device and try again."); } internal static void ShowSongInfo() @@ -472,7 +472,7 @@ internal static void ShowSongInfo() textsBuilder.AppendLine($"T - {text.Item1}: {text.Item2}"); foreach (var text in idv2?.Extras ?? []) textsBuilder.AppendLine($"E - {text.Item1}: {text.Item2}"); - InfoBoxColor.WriteInfoBox( + InfoBoxModalColor.WriteInfoBoxModal( $$""" Song info ========= diff --git a/BassBoom.Cli/CliBase/Radio.cs b/BassBoom.Cli/CliBase/Radio.cs index 571e429..81b33b3 100644 --- a/BassBoom.Cli/CliBase/Radio.cs +++ b/BassBoom.Cli/CliBase/Radio.cs @@ -138,21 +138,21 @@ public static void RadioLoop() { if (PlaybackTools.IsPlaying(BassBoomCli.basolia)) PlaybackTools.Stop(BassBoomCli.basolia); - InfoBoxColor.WriteInfoBox("There's an error with Basolia when trying to process the music file.\n\n" + bex.Message); + InfoBoxModalColor.WriteInfoBoxModal("There's an error with Basolia when trying to process the music file.\n\n" + bex.Message); radioScreen.RequireRefresh(); } catch (BasoliaOutException bex) { if (PlaybackTools.IsPlaying(BassBoomCli.basolia)) PlaybackTools.Stop(BassBoomCli.basolia); - InfoBoxColor.WriteInfoBox("There's an error with Basolia output when trying to process the music file.\n\n" + bex.Message); + InfoBoxModalColor.WriteInfoBoxModal("There's an error with Basolia output when trying to process the music file.\n\n" + bex.Message); radioScreen.RequireRefresh(); } catch (Exception ex) { if (PlaybackTools.IsPlaying(BassBoomCli.basolia)) PlaybackTools.Stop(BassBoomCli.basolia); - InfoBoxColor.WriteInfoBox("There's an unknown error when trying to process the music file.\n\n" + ex.Message); + InfoBoxModalColor.WriteInfoBoxModal("There's an unknown error when trying to process the music file.\n\n" + ex.Message); radioScreen.RequireRefresh(); } } @@ -290,7 +290,7 @@ private static void HandlePlay() } catch (Exception ex) { - InfoBoxColor.WriteInfoBox($"Playback failure: {ex.Message}"); + InfoBoxModalColor.WriteInfoBoxModal($"Playback failure: {ex.Message}"); Common.failedToPlay = true; } } diff --git a/BassBoom.Cli/CliBase/RadioControls.cs b/BassBoom.Cli/CliBase/RadioControls.cs index 7e5ca93..3885bb8 100644 --- a/BassBoom.Cli/CliBase/RadioControls.cs +++ b/BassBoom.Cli/CliBase/RadioControls.cs @@ -128,7 +128,7 @@ internal static void PromptForAddStations() } } else - InfoBoxColor.WriteInfoBox("Radio station playlist is not found."); + InfoBoxModalColor.WriteInfoBoxModal("Radio station playlist is not found."); } internal static void PopulateRadioStationInfo(string musicPath) @@ -140,7 +140,7 @@ internal static void PopulateRadioStationInfo(string musicPath) Common.Switch(musicPath); if (!Common.cachedInfos.Any((csi) => csi.MusicPath == musicPath)) { - InfoBoxColor.WriteInfoBox($"Opening {musicPath}...", false); + InfoBoxNonModalColor.WriteInfoBox($"Opening {musicPath}...", false); var formatInfo = FormatTools.GetFormatInfo(BassBoomCli.basolia); var frameInfo = AudioInfoTools.GetFrameInfo(BassBoomCli.basolia); @@ -192,7 +192,7 @@ internal static void ShowStationInfo() { if (Common.CurrentCachedInfo is null) return; - InfoBoxColor.WriteInfoBox( + InfoBoxModalColor.WriteInfoBoxModal( $$""" Station info ============ @@ -250,7 +250,7 @@ internal static void ShowExtendedStationInfo() streamBuilder.AppendLine($"Media type: {stream.MimeInfo}"); streamBuilder.AppendLine("==============================="); } - InfoBoxColor.WriteInfoBox( + InfoBoxModalColor.WriteInfoBoxModal( $$""" Radio server info ================= @@ -270,7 +270,7 @@ Stream info ); } else - InfoBoxColor.WriteInfoBox($"Unable to get extended radio station info for {Common.CurrentCachedInfo.MusicPath}"); + InfoBoxModalColor.WriteInfoBoxModal($"Unable to get extended radio station info for {Common.CurrentCachedInfo.MusicPath}"); } } }