RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 13:17:35 +00:00
Code Issues Activity Actions

LibAudio: Get rid of unused method Loader::file()

Browse source 
`aplay` and two files of `SoundPlayer` were relying on the include of
`LibCore/File.h` by `Loader.h`.
This commit is contained in:
Lucas CHOLLET 2022-10-12 18:20:39 +02:00 • committed by Linus Groh
parent 1444b42936
commit 2d6124049a
6 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Userland/Applications/SoundPlayer/Player.cpp
View file

@ -6,6 +6,7 @@
*/ */
#include "Player.h" #include "Player.h"
#include <LibCore/File.h>
Player::Player(Audio::ConnectionToServer& audio_client_connection) Player::Player(Audio::ConnectionToServer& audio_client_connection)
: m_audio_client_connection(audio_client_connection) : m_audio_client_connection(audio_client_connection)

1
Userland/Applications/SoundPlayer/Playlist.cpp
View file

@ -10,6 +10,7 @@
#include <AK/LexicalPath.h> #include <AK/LexicalPath.h>
#include <AK/Random.h> #include <AK/Random.h>
#include <LibAudio/Loader.h> #include <LibAudio/Loader.h>
#include <LibCore/File.h>
#include <LibGUI/MessageBox.h> #include <LibGUI/MessageBox.h>
bool Playlist::load(StringView path) bool Playlist::load(StringView path)

1
Userland/Libraries/LibAudio/FlacLoader.h
View file

@ -66,7 +66,6 @@ public:
virtual u16 num_channels() override { return m_num_channels; } virtual u16 num_channels() override { return m_num_channels; }
virtual String format_name() override { return "FLAC (.flac)"; } virtual String format_name() override { return "FLAC (.flac)"; }
virtual PcmSampleFormat pcm_format() override { return m_sample_format; } virtual PcmSampleFormat pcm_format() override { return m_sample_format; }
virtual RefPtr<Core::File> file() override { return m_file; }
bool is_fixed_blocksize_stream() const { return m_min_block_size == m_max_block_size; } bool is_fixed_blocksize_stream() const { return m_min_block_size == m_max_block_size; }
bool sample_count_unknown() const { return m_total_samples == 0; } bool sample_count_unknown() const { return m_total_samples == 0; }

3
Userland/Libraries/LibAudio/Loader.h
View file

@ -18,7 +18,6 @@
#include <LibAudio/LoaderError.h> #include <LibAudio/LoaderError.h>
#include <LibAudio/Sample.h> #include <LibAudio/Sample.h>
#include <LibAudio/SampleFormats.h> #include <LibAudio/SampleFormats.h>
#include <LibCore/File.h>
namespace Audio { namespace Audio {
@ -54,7 +53,6 @@ public:
// Human-readable name of the file format, of the form <full abbreviation> (.<ending>) // Human-readable name of the file format, of the form <full abbreviation> (.<ending>)
virtual String format_name() = 0; virtual String format_name() = 0;
virtual PcmSampleFormat pcm_format() = 0; virtual PcmSampleFormat pcm_format() = 0;
virtual RefPtr<Core::File> file() = 0;
}; };
class Loader : public RefCounted<Loader> { class Loader : public RefCounted<Loader> {
@ -73,7 +71,6 @@ public:
u16 num_channels() const { return m_plugin->num_channels(); } u16 num_channels() const { return m_plugin->num_channels(); }
String format_name() const { return m_plugin->format_name(); } String format_name() const { return m_plugin->format_name(); }
u16 bits_per_sample() const { return pcm_bits_per_sample(m_plugin->pcm_format()); } u16 bits_per_sample() const { return pcm_bits_per_sample(m_plugin->pcm_format()); }
RefPtr<Core::File> file() const { return m_plugin->file(); }
private: private:
static Result<NonnullOwnPtr<LoaderPlugin>, LoaderError> try_create(StringView path); static Result<NonnullOwnPtr<LoaderPlugin>, LoaderError> try_create(StringView path);

1
Userland/Libraries/LibAudio/MP3Loader.h
View file

@ -35,7 +35,6 @@ public:
virtual u32 sample_rate() override { return m_sample_rate; } virtual u32 sample_rate() override { return m_sample_rate; }
virtual u16 num_channels() override { return m_num_channels; } virtual u16 num_channels() override { return m_num_channels; }
virtual PcmSampleFormat pcm_format() override { return m_sample_format; } virtual PcmSampleFormat pcm_format() override { return m_sample_format; }
virtual RefPtr<Core::File> file() override { return m_file; }
virtual String format_name() override { return "MP3 (.mp3)"; } virtual String format_name() override { return "MP3 (.mp3)"; }
private: private:

1
Userland/Utilities/aplay.cpp
View file

@ -11,6 +11,7 @@
#include <LibAudio/Resampler.h> #include <LibAudio/Resampler.h>
#include <LibCore/ArgsParser.h> #include <LibCore/ArgsParser.h>
#include <LibCore/EventLoop.h> #include <LibCore/EventLoop.h>
#include <LibCore/File.h>
#include <LibCore/System.h> #include <LibCore/System.h>
#include <LibMain/Main.h> #include <LibMain/Main.h>
#include <math.h> #include <math.h>