RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-28 02:47:34 +00:00
Code Issues Activity Actions

LibAudio: Move WavLoader to Core::Stream APIs

Browse source 
This makes the code much more readable and concise, reduces the size of
the WavLoader class itself, moves almost all fallible initialization out
of the constructor and should provide better error handling in general.

Also, a lot of now-unnecessary imports are removed.
This commit is contained in:
kleines Filmröllchen 2022-04-23 11:08:45 +02:00 • committed by Linus Groh
parent 81a336ea45
commit a32d675164
2 changed files with 42 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Userland/Libraries/LibAudio/WavLoader.h
View file

@ -7,18 +7,15 @@
#pragma once
#include <AK/MemoryStream.h>
#include <AK/OwnPtr.h>
#include <AK/RefPtr.h>
#include <AK/Span.h>
#include <AK/Stream.h>
#include <AK/String.h>
#include <AK/StringView.h>
#include <AK/WeakPtr.h>
#include <LibAudio/Buffer.h>
#include <LibAudio/Loader.h>
#include <LibCore/File.h>
#include <LibCore/FileStream.h>
#include <LibCore/Stream.h>
namespace Audio {
@ -29,7 +26,7 @@ static constexpr unsigned const WAVE_FORMAT_ALAW = 0x0006; // 8-bit ITU-T
static constexpr unsigned const WAVE_FORMAT_MULAW = 0x0007; // 8-bit ITU-T G.711 µ-law
static constexpr unsigned const WAVE_FORMAT_EXTENSIBLE = 0xFFFE; // Determined by SubFormat
// Parses a WAV file and produces an Audio::LegacyBuffer.
// Parses and reads audio data from a WAV file.
class WavLoaderPlugin : public LoaderPlugin {
public:
explicit WavLoaderPlugin(StringView path);
@ -56,10 +53,11 @@ public:
private:
MaybeLoaderError parse_header();
// This is only kept around for compatibility for now.
RefPtr<Core::File> m_file;
OwnPtr<AK::InputStream> m_stream;
AK::InputMemoryStream* m_memory_stream;
Optional<LoaderError> m_error {};
OwnPtr<Core::Stream::SeekableStream> m_stream;
// The constructor might set this so that we can initialize the data stream later.
Optional<Bytes const&> m_backing_memory;
u32 m_sample_rate { 0 };
u16 m_num_channels { 0 };