diff --git a/Userland/Libraries/LibAudio/WavLoader.cpp b/Userland/Libraries/LibAudio/WavLoader.cpp index f7b89a9636..458eb68eba 100644 --- a/Userland/Libraries/LibAudio/WavLoader.cpp +++ b/Userland/Libraries/LibAudio/WavLoader.cpp @@ -19,7 +19,7 @@ namespace Audio { static constexpr size_t const maximum_wav_size = 1 * GiB; // FIXME: is there a more appropriate size limit? WavLoaderPlugin::WavLoaderPlugin(StringView path) - : m_file(Core::File::construct(path)) + : m_path(path) { } @@ -28,7 +28,7 @@ MaybeLoaderError WavLoaderPlugin::initialize() if (m_backing_memory.has_value()) m_stream = LOADER_TRY(Core::Stream::MemoryStream::construct(m_backing_memory.value())); else - m_stream = LOADER_TRY(Core::Stream::File::open(m_file->filename(), Core::Stream::OpenMode::Read)); + m_stream = LOADER_TRY(Core::Stream::File::open(m_path, Core::Stream::OpenMode::Read)); TRY(parse_header()); return {}; diff --git a/Userland/Libraries/LibAudio/WavLoader.h b/Userland/Libraries/LibAudio/WavLoader.h index 0901dd8106..ff96120d57 100644 --- a/Userland/Libraries/LibAudio/WavLoader.h +++ b/Userland/Libraries/LibAudio/WavLoader.h @@ -48,7 +48,6 @@ public: virtual u16 num_channels() override { return m_num_channels; } virtual String format_name() override { return "RIFF WAVE (.wav)"; } virtual PcmSampleFormat pcm_format() override { return m_sample_format; } - virtual RefPtr file() override { return m_file; } private: MaybeLoaderError parse_header(); @@ -57,8 +56,7 @@ private: template MaybeLoaderError read_samples_from_stream(Core::Stream::Stream& stream, SampleReader read_sample, FixedArray& samples) const; - // This is only kept around for compatibility for now. - RefPtr m_file; + StringView m_path; OwnPtr m_stream; // The constructor might set this so that we can initialize the data stream later. Optional m_backing_memory;