From 1d24f394c61d8e2af216c95303014d0554165f72 Mon Sep 17 00:00:00 2001 From: Cameron Youell Date: Wed, 22 Mar 2023 02:35:30 +1100 Subject: Everywhere: Use `LibFileSystem` where trivial --- Userland/Applications/SoundPlayer/AlbumCoverVisualizationWidget.cpp | 4 ++-- Userland/Applications/SoundPlayer/CMakeLists.txt | 2 +- Userland/Applications/SoundPlayer/Player.cpp | 4 ++-- Userland/Applications/SoundPlayer/Playlist.cpp | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) (limited to 'Userland/Applications/SoundPlayer') diff --git a/Userland/Applications/SoundPlayer/AlbumCoverVisualizationWidget.cpp b/Userland/Applications/SoundPlayer/AlbumCoverVisualizationWidget.cpp index 3eeda05ed7..5c56a5bdaa 100644 --- a/Userland/Applications/SoundPlayer/AlbumCoverVisualizationWidget.cpp +++ b/Userland/Applications/SoundPlayer/AlbumCoverVisualizationWidget.cpp @@ -8,7 +8,7 @@ #include "AlbumCoverVisualizationWidget.h" #include -#include +#include #include #include @@ -48,7 +48,7 @@ ErrorOr> AlbumCoverVisualizationWidget::get_album_cov static constexpr auto possible_cover_filenames = Array { "cover.png"sv, "cover.jpg"sv }; for (auto& it : possible_cover_filenames) { LexicalPath cover_path = LexicalPath::join(directory, it); - if (Core::DeprecatedFile::exists(cover_path.string())) + if (FileSystem::exists(cover_path.string())) return Gfx::Bitmap::load_from_file(cover_path.string()); } diff --git a/Userland/Applications/SoundPlayer/CMakeLists.txt b/Userland/Applications/SoundPlayer/CMakeLists.txt index c827fc42b3..66926eb5e4 100644 --- a/Userland/Applications/SoundPlayer/CMakeLists.txt +++ b/Userland/Applications/SoundPlayer/CMakeLists.txt @@ -19,4 +19,4 @@ set(SOURCES ) serenity_app(SoundPlayer ICON app-sound-player) -target_link_libraries(SoundPlayer PRIVATE LibAudio LibConfig LibCore LibDSP LibGfx LibGUI LibIPC LibMain LibThreading LibImageDecoderClient) +target_link_libraries(SoundPlayer PRIVATE LibAudio LibConfig LibCore LibFileSystem LibDSP LibGfx LibGUI LibIPC LibMain LibThreading LibImageDecoderClient) diff --git a/Userland/Applications/SoundPlayer/Player.cpp b/Userland/Applications/SoundPlayer/Player.cpp index af254a0480..41c874cdd0 100644 --- a/Userland/Applications/SoundPlayer/Player.cpp +++ b/Userland/Applications/SoundPlayer/Player.cpp @@ -7,7 +7,7 @@ #include "Player.h" #include -#include +#include Player::Player(Audio::ConnectionToServer& audio_client_connection) : m_audio_client_connection(audio_client_connection) @@ -44,7 +44,7 @@ void Player::play_file_path(DeprecatedString const& path) if (path.is_null()) return; - if (!Core::DeprecatedFile::exists(path)) { + if (!FileSystem::exists(path)) { audio_load_error(path, "File does not exist"sv); return; } diff --git a/Userland/Applications/SoundPlayer/Playlist.cpp b/Userland/Applications/SoundPlayer/Playlist.cpp index 63bd4e9774..6e841291ed 100644 --- a/Userland/Applications/SoundPlayer/Playlist.cpp +++ b/Userland/Applications/SoundPlayer/Playlist.cpp @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include bool Playlist::load(StringView path) @@ -39,11 +39,11 @@ void Playlist::try_fill_missing_info(Vector& entries, StringView path) entry.path = DeprecatedString::formatted("{}/{}", playlist_path.dirname(), entry.path); if (!entry.extended_info->file_size_in_bytes.has_value()) { - auto size = Core::DeprecatedFile::size(entry.path); + auto size = FileSystem::size(entry.path); if (size.is_error()) continue; entry.extended_info->file_size_in_bytes = size.value(); - } else if (!Core::DeprecatedFile::exists(entry.path)) { + } else if (!FileSystem::exists(entry.path)) { to_delete.append(&entry); continue; } -- cgit v1.2.3