diff --git a/BassBoom.Cli/CliBase/Common.cs b/BassBoom.Cli/CliBase/Common.cs index 097b034..3e447b5 100644 --- a/BassBoom.Cli/CliBase/Common.cs +++ b/BassBoom.Cli/CliBase/Common.cs @@ -121,7 +121,7 @@ internal static void ShowDeviceDriver() continue; } } - InfoBoxColor.WriteInfoBox( + InfoBoxModalColor.WriteInfoBoxModal( $$""" Device and Driver ================= @@ -138,7 +138,7 @@ Available devices and drivers internal static void ShowSpecs() { - InfoBoxColor.WriteInfoBox( + InfoBoxModalColor.WriteInfoBoxModal( $$""" BassBoom specifications ======================= @@ -170,7 +170,7 @@ System specifications internal static void ShowHelp() { - InfoBoxColor.WriteInfoBox( + InfoBoxModalColor.WriteInfoBoxModal( """ Available keystrokes ==================== @@ -206,7 +206,7 @@ [Z] System info internal static void ShowHelpRadio() { - InfoBoxColor.WriteInfoBox( + InfoBoxModalColor.WriteInfoBoxModal( """ Available keystrokes ==================== diff --git a/BassBoom.Cli/CliBase/Equalizer.cs b/BassBoom.Cli/CliBase/Equalizer.cs index 9e4dbcc..5b12705 100644 --- a/BassBoom.Cli/CliBase/Equalizer.cs +++ b/BassBoom.Cli/CliBase/Equalizer.cs @@ -62,15 +62,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 768212c..97c6de8 100644 --- a/BassBoom.Cli/CliBase/Player.cs +++ b/BassBoom.Cli/CliBase/Player.cs @@ -116,21 +116,21 @@ public static void PlayerLoop() { if (PlaybackTools.Playing) PlaybackTools.Stop(); - 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.Playing) PlaybackTools.Stop(); - 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.Playing) PlaybackTools.Stop(); - 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(); } } @@ -305,7 +305,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 c7f6497..34659e7 100644 --- a/BassBoom.Cli/CliBase/PlayerControls.cs +++ b/BassBoom.Cli/CliBase/PlayerControls.cs @@ -236,7 +236,7 @@ internal static void PromptForAddSong() PlaybackPositioningTools.SeekToFrame(currentPos); } else - InfoBoxColor.WriteInfoBox($"File \"{path}\" doesn't exist."); + InfoBoxModalColor.WriteInfoBoxModal($"File \"{path}\" doesn't exist."); } internal static void PromptForAddDirectory() @@ -260,7 +260,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) @@ -273,7 +273,7 @@ internal static void PopulateMusicFileInfo(string musicPath) if (!Common.cachedInfos.Any((csi) => csi.MusicPath == musicPath)) { ScreenTools.CurrentScreen?.RequireRefresh(); - InfoBoxColor.WriteInfoBox($"Loading BassBoom to open {musicPath}...", false); + InfoBoxNonModalColor.WriteInfoBox($"Loading BassBoom to open {musicPath}..."); var total = AudioInfoTools.GetDuration(true); var formatInfo = FormatTools.GetFormatInfo(); var frameInfo = AudioInfoTools.GetFrameInfo(); @@ -344,7 +344,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}..."); if (File.Exists(lyricsPath)) return LyricReader.GetLyrics(lyricsPath); else @@ -352,7 +352,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; } @@ -416,7 +416,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 9845195..68d805e 100644 --- a/BassBoom.Cli/CliBase/Radio.cs +++ b/BassBoom.Cli/CliBase/Radio.cs @@ -108,21 +108,21 @@ public static void RadioLoop() { if (PlaybackTools.Playing) PlaybackTools.Stop(); - 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.Playing) PlaybackTools.Stop(); - 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.Playing) PlaybackTools.Stop(); - 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(); } } @@ -245,7 +245,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 ce0895c..2bb2835 100644 --- a/BassBoom.Cli/CliBase/RadioControls.cs +++ b/BassBoom.Cli/CliBase/RadioControls.cs @@ -114,7 +114,7 @@ internal static void PopulateRadioStationInfo(string musicPath) Common.Switch(musicPath); if (!Common.cachedInfos.Any((csi) => csi.MusicPath == musicPath)) { - InfoBoxColor.WriteInfoBox($"Loading BassBoom to open {musicPath}...", false); + InfoBoxNonModalColor.WriteInfoBox($"Loading BassBoom to open {musicPath}..."); var formatInfo = FormatTools.GetFormatInfo(); var frameInfo = AudioInfoTools.GetFrameInfo(); @@ -168,7 +168,7 @@ internal static void ShowStationInfo() { if (Common.CurrentCachedInfo is null) return; - InfoBoxColor.WriteInfoBox( + InfoBoxModalColor.WriteInfoBoxModal( $$""" Station info ============ @@ -226,7 +226,7 @@ internal static void ShowExtendedStationInfo() streamBuilder.AppendLine($"Media type: {stream.MimeInfo}"); streamBuilder.AppendLine("==============================="); } - InfoBoxColor.WriteInfoBox( + InfoBoxModalColor.WriteInfoBoxModal( $$""" Radio server info ================= @@ -246,7 +246,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}"); } } }