Skip to content

Commit

Permalink
upd - Updated libraries
Browse files Browse the repository at this point in the history 
---

Type: upd
Breaking: False
Doc Required: False
Backport Required: False
Part: 1/1
  • Loading branch information
@AptiviCEO
AptiviCEO committed Oct 7, 2024
1 parent 2cb1b0d commit 3640189
Show file tree
Hide file tree
Showing 8 changed files with 33 additions and 33 deletions.
4 changes: 2 additions & 2 deletions BassBoom.Basolia/BassBoom.Basolia.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="HtmlAgilityPack" Version="1.11.65" />
<PackageReference Include="HtmlAgilityPack" Version="1.11.67" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="System.Net.Http" Version="4.3.4" />
<PackageReference Include="Textify.Offline" Version="1.13.0" />
<PackageReference Include="Textify.Offline" Version="2.0.3" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion BassBoom.Cli/BassBoom.Cli.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Terminaux" Version="5.2.0" />
<PackageReference Include="Terminaux" Version="5.4.0.1" />
</ItemGroup>

<ItemGroup>
Expand Down
8 changes: 4 additions & 4 deletions BassBoom.Cli/CliBase/Common.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ internal static void ShowDeviceDriver()
continue;
}
}
InfoBoxColor.WriteInfoBox(
InfoBoxModalColor.WriteInfoBoxModal(
$$"""
Device and Driver
=================
Expand Down Expand Up @@ -221,7 +221,7 @@ Buffer info
""");
}

InfoBoxColor.WriteInfoBox(
InfoBoxModalColor.WriteInfoBoxModal(
$$"""
BassBoom specifications
=======================
Expand All @@ -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)
);
}
Expand Down
6 changes: 3 additions & 3 deletions BassBoom.Cli/CliBase/Equalizer.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}

Expand Down
8 changes: 4 additions & 4 deletions BassBoom.Cli/CliBase/Player.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
}
Expand Down Expand Up @@ -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;
}
}
Expand Down
20 changes: 10 additions & 10 deletions BassBoom.Cli/CliBase/PlayerControls.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down Expand Up @@ -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()
Expand All @@ -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)
Expand All @@ -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);
Expand Down Expand Up @@ -369,15 +369,15 @@ 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
return null;
}
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;
}
Expand Down Expand Up @@ -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/";
Expand All @@ -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()
Expand All @@ -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
=========
Expand Down
8 changes: 4 additions & 4 deletions BassBoom.Cli/CliBase/Radio.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
}
Expand Down Expand Up @@ -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;
}
}
Expand Down
10 changes: 5 additions & 5 deletions BassBoom.Cli/CliBase/RadioControls.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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);

Expand Down Expand Up @@ -192,7 +192,7 @@ internal static void ShowStationInfo()
{
if (Common.CurrentCachedInfo is null)
return;
InfoBoxColor.WriteInfoBox(
InfoBoxModalColor.WriteInfoBoxModal(
$$"""
Station info
============
Expand Down Expand Up @@ -250,7 +250,7 @@ internal static void ShowExtendedStationInfo()
streamBuilder.AppendLine($"Media type: {stream.MimeInfo}");
streamBuilder.AppendLine("===============================");
}
InfoBoxColor.WriteInfoBox(
InfoBoxModalColor.WriteInfoBoxModal(
$$"""
Radio server info
=================
Expand All @@ -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}");
}
}
}

0 comments on commit 3640189

Please sign in to comment.