mirror of
https://github.com/RGBCube/serenity
synced 2025-07-27 17:37:34 +00:00
Everywhere: Rename {Deprecated => Byte}String
This commit un-deprecates DeprecatedString, and repurposes it as a byte string. As the null state has already been removed, there are no other particularly hairy blockers in repurposing this type as a byte string (what it _really_ is). This commit is auto-generated: $ xs=$(ack -l \bDeprecatedString\b\|deprecated_string AK Userland \ Meta Ports Ladybird Tests Kernel) $ perl -pie 's/\bDeprecatedString\b/ByteString/g; s/deprecated_string/byte_string/g' $xs $ clang-format --style=file -i \ $(git diff --name-only | grep \.cpp\|\.h) $ gn format $(git ls-files '*.gn' '*.gni')
This commit is contained in:
parent
38d62563b3
commit
5e1499d104
1615 changed files with 10257 additions and 10257 deletions
|
@ -20,10 +20,10 @@ NonnullOwnPtr<M3UParser> M3UParser::from_file(StringView path)
|
|||
auto file_result = Core::File::open(path, Core::File::OpenMode::Read).release_value_but_fixme_should_propagate_errors();
|
||||
auto contents = file_result->read_until_eof().release_value_but_fixme_should_propagate_errors();
|
||||
auto use_utf8 = path.ends_with(".m3u8"sv, CaseSensitivity::CaseInsensitive);
|
||||
return from_memory(DeprecatedString { contents, NoChomp }, use_utf8);
|
||||
return from_memory(ByteString { contents, NoChomp }, use_utf8);
|
||||
}
|
||||
|
||||
NonnullOwnPtr<M3UParser> M3UParser::from_memory(DeprecatedString const& m3u_contents, bool utf8)
|
||||
NonnullOwnPtr<M3UParser> M3UParser::from_memory(ByteString const& m3u_contents, bool utf8)
|
||||
{
|
||||
auto parser = make<M3UParser>();
|
||||
VERIFY(!m3u_contents.is_empty() && !m3u_contents.is_whitespace());
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
|
||||
#pragma once
|
||||
|
||||
#include <AK/DeprecatedString.h>
|
||||
#include <AK/ByteString.h>
|
||||
#include <AK/Optional.h>
|
||||
#include <AK/RefPtr.h>
|
||||
#include <AK/StringView.h>
|
||||
|
@ -15,35 +15,35 @@
|
|||
// Extended M3U fields (de facto standard)
|
||||
struct M3UExtendedInfo {
|
||||
Optional<u32> track_length_in_seconds;
|
||||
Optional<DeprecatedString> track_display_title;
|
||||
Optional<DeprecatedString> group_name;
|
||||
Optional<DeprecatedString> album_title;
|
||||
Optional<DeprecatedString> album_artist;
|
||||
Optional<DeprecatedString> album_genre;
|
||||
Optional<ByteString> track_display_title;
|
||||
Optional<ByteString> group_name;
|
||||
Optional<ByteString> album_title;
|
||||
Optional<ByteString> album_artist;
|
||||
Optional<ByteString> album_genre;
|
||||
Optional<u64> file_size_in_bytes;
|
||||
Optional<ReadonlyBytes> embedded_mp3;
|
||||
Optional<DeprecatedString> cover_path;
|
||||
Optional<ByteString> cover_path;
|
||||
};
|
||||
|
||||
struct M3UEntry {
|
||||
DeprecatedString path;
|
||||
ByteString path;
|
||||
Optional<M3UExtendedInfo> extended_info;
|
||||
};
|
||||
|
||||
class M3UParser {
|
||||
public:
|
||||
static NonnullOwnPtr<M3UParser> from_file(StringView path);
|
||||
static NonnullOwnPtr<M3UParser> from_memory(DeprecatedString const& m3u_contents, bool utf8);
|
||||
static NonnullOwnPtr<M3UParser> from_memory(ByteString const& m3u_contents, bool utf8);
|
||||
|
||||
NonnullOwnPtr<Vector<M3UEntry>> parse(bool include_extended_info);
|
||||
|
||||
Optional<DeprecatedString>& get_playlist_title_metadata() { return m_parsed_playlist_title; }
|
||||
Optional<ByteString>& get_playlist_title_metadata() { return m_parsed_playlist_title; }
|
||||
|
||||
M3UParser();
|
||||
|
||||
private:
|
||||
DeprecatedString m_m3u_raw_data;
|
||||
DeprecatedString m_playlist_path;
|
||||
ByteString m_m3u_raw_data;
|
||||
ByteString m_playlist_path;
|
||||
bool m_use_utf8;
|
||||
Optional<DeprecatedString> m_parsed_playlist_title;
|
||||
Optional<ByteString> m_parsed_playlist_title;
|
||||
};
|
||||
|
|
|
@ -38,7 +38,7 @@ Player::Player(Audio::ConnectionToServer& audio_client_connection)
|
|||
};
|
||||
}
|
||||
|
||||
void Player::play_file_path(DeprecatedString const& path)
|
||||
void Player::play_file_path(ByteString const& path)
|
||||
{
|
||||
if (!FileSystem::exists(path)) {
|
||||
audio_load_error(path, "File does not exist"sv);
|
||||
|
@ -66,7 +66,7 @@ void Player::play_file_path(DeprecatedString const& path)
|
|||
play();
|
||||
}
|
||||
|
||||
bool Player::is_playlist(DeprecatedString const& path)
|
||||
bool Player::is_playlist(ByteString const& path)
|
||||
{
|
||||
return (path.ends_with(".m3u"sv, AK::CaseSensitivity::CaseInsensitive)
|
||||
|| path.ends_with(".m3u8"sv, AK::CaseSensitivity::CaseInsensitive));
|
||||
|
|
|
@ -35,12 +35,12 @@ public:
|
|||
explicit Player(Audio::ConnectionToServer& audio_client_connection);
|
||||
virtual ~Player() = default;
|
||||
|
||||
void play_file_path(DeprecatedString const& path);
|
||||
bool is_playlist(DeprecatedString const& path);
|
||||
void play_file_path(ByteString const& path);
|
||||
bool is_playlist(ByteString const& path);
|
||||
|
||||
Playlist& playlist() { return m_playlist; }
|
||||
PlaybackManager const& playback_manager() const { return m_playback_manager; }
|
||||
DeprecatedString const& loaded_filename() const { return m_loaded_filename; }
|
||||
ByteString const& loaded_filename() const { return m_loaded_filename; }
|
||||
|
||||
PlayState play_state() const { return m_play_state; }
|
||||
void set_play_state(PlayState);
|
||||
|
@ -98,7 +98,7 @@ private:
|
|||
Audio::ConnectionToServer& m_audio_client_connection;
|
||||
PlaybackManager m_playback_manager;
|
||||
|
||||
DeprecatedString m_loaded_filename;
|
||||
ByteString m_loaded_filename;
|
||||
double m_volume { 0 };
|
||||
bool m_muted { false };
|
||||
};
|
||||
|
|
|
@ -36,7 +36,7 @@ void Playlist::try_fill_missing_info(Vector<M3UEntry>& entries, StringView path)
|
|||
|
||||
for (auto& entry : entries) {
|
||||
if (!LexicalPath { entry.path }.is_absolute())
|
||||
entry.path = DeprecatedString::formatted("{}/{}", playlist_path.dirname(), entry.path);
|
||||
entry.path = ByteString::formatted("{}/{}", playlist_path.dirname(), entry.path);
|
||||
|
||||
if (!entry.extended_info->file_size_in_bytes.has_value()) {
|
||||
auto size = FileSystem::size(entry.path);
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
#include "M3UParser.h"
|
||||
#include "PlaybackManager.h"
|
||||
#include "SampleWidget.h"
|
||||
#include <AK/DeprecatedString.h>
|
||||
#include <AK/ByteString.h>
|
||||
#include <AK/LexicalPath.h>
|
||||
#include <AK/NumberFormat.h>
|
||||
#include <AK/SIMD.h>
|
||||
|
@ -250,17 +250,17 @@ void SoundPlayerWidget::time_elapsed(int seconds)
|
|||
void SoundPlayerWidget::file_name_changed(StringView name)
|
||||
{
|
||||
m_visualization->start_new_file(name);
|
||||
DeprecatedString title = name;
|
||||
ByteString title = name;
|
||||
if (playback_manager().loader()) {
|
||||
auto const& metadata = playback_manager().loader()->metadata();
|
||||
if (auto artists_or_error = metadata.all_artists(" / "_string);
|
||||
!artists_or_error.is_error() && artists_or_error.value().has_value() && metadata.title.has_value()) {
|
||||
title = DeprecatedString::formatted("{} – {}", metadata.title.value(), artists_or_error.release_value().release_value());
|
||||
title = ByteString::formatted("{} – {}", metadata.title.value(), artists_or_error.release_value().release_value());
|
||||
} else if (metadata.title.has_value()) {
|
||||
title = metadata.title.value().to_deprecated_string();
|
||||
title = metadata.title.value().to_byte_string();
|
||||
}
|
||||
}
|
||||
m_window.set_title(DeprecatedString::formatted("{} — Sound Player", title));
|
||||
m_window.set_title(ByteString::formatted("{} — Sound Player", title));
|
||||
}
|
||||
|
||||
void SoundPlayerWidget::total_samples_changed(int total_samples)
|
||||
|
@ -286,7 +286,7 @@ void SoundPlayerWidget::volume_changed(double volume)
|
|||
void SoundPlayerWidget::playlist_loaded(StringView path, bool loaded)
|
||||
{
|
||||
if (!loaded) {
|
||||
GUI::MessageBox::show(&m_window, DeprecatedString::formatted("Could not load playlist at \"{}\".", path), "Error opening playlist"sv, GUI::MessageBox::Type::Error);
|
||||
GUI::MessageBox::show(&m_window, ByteString::formatted("Could not load playlist at \"{}\".", path), "Error opening playlist"sv, GUI::MessageBox::Type::Error);
|
||||
return;
|
||||
}
|
||||
set_playlist_visible(true);
|
||||
|
@ -295,6 +295,6 @@ void SoundPlayerWidget::playlist_loaded(StringView path, bool loaded)
|
|||
|
||||
void SoundPlayerWidget::audio_load_error(StringView path, StringView error_string)
|
||||
{
|
||||
GUI::MessageBox::show(&m_window, DeprecatedString::formatted("Failed to load audio file: {} ({})", path, error_string.is_null() ? "Unknown error"sv : error_string),
|
||||
GUI::MessageBox::show(&m_window, ByteString::formatted("Failed to load audio file: {} ({})", path, error_string.is_null() ? "Unknown error"sv : error_string),
|
||||
"Filetype error"sv, GUI::MessageBox::Type::Error);
|
||||
}
|
||||
|
|
|
@ -62,7 +62,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
|||
|
||||
auto file_menu = window->add_menu("&File"_string);
|
||||
file_menu->add_action(GUI::CommonActions::make_open_action([&](auto&) {
|
||||
Optional<DeprecatedString> path = GUI::FilePicker::get_open_filepath(window);
|
||||
Optional<ByteString> path = GUI::FilePicker::get_open_filepath(window);
|
||||
if (path.has_value()) {
|
||||
player->play_file_path(path.value());
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue