Bananymous/banan-os
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

LibAudio: Rename AudioLoader -> AudioStream

Browse Source
This commit is contained in:
Bananymous
2026-08-19 21:32:36 +03:00
parent 2c66de888f
commit ac99bf128b
7 changed files with 45 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
userspace/libraries/LibAudio/include/LibAudio/Audio.h
+4 -4
View File
@@ -4,7 +4,7 @@
#include <BAN/StringView.h>
#include <BAN/Vector.h>
#include <LibAudio/AudioLoader.h>
#include <LibAudio/AudioStream.h>
namespace LibAudio
{
@@ -49,8 +49,8 @@ namespace LibAudio
private:
Audio() = default;
Audio(BAN::UniqPtr<AudioLoader>&& audio_loader)
: m_audio_loader(BAN::move(audio_loader))
Audio(BAN::UniqPtr<AudioStream>&& audio_stream)
: m_audio_stream(BAN::move(audio_stream))
{ }
void clear();
@@ -60,7 +60,7 @@ namespace LibAudio
private:
int m_server_fd { -1 };
BAN::UniqPtr<AudioLoader> m_audio_loader;
BAN::UniqPtr<AudioStream> m_audio_stream;
int m_shmid { -1 };
AudioBuffer* m_audio_buffer { nullptr };
userspace/libraries/LibAudio/include/LibAudio/AudioLoader.h → userspace/libraries/LibAudio/include/LibAudio/AudioStream.h
+6 -6
View File
@@ -6,14 +6,14 @@
namespace LibAudio
{
class AudioLoader
class AudioStream
{
BAN_NON_COPYABLE(AudioLoader);
BAN_NON_MOVABLE(AudioLoader);
BAN_NON_COPYABLE(AudioStream);
BAN_NON_MOVABLE(AudioStream);
public:
static BAN::ErrorOr<BAN::UniqPtr<AudioLoader>> load(BAN::StringView path);
virtual ~AudioLoader();
static BAN::ErrorOr<BAN::UniqPtr<AudioStream>> load(BAN::StringView path);
virtual ~AudioStream();
virtual uint32_t channels() const = 0;
virtual uint32_t sample_rate() const = 0;
@@ -22,7 +22,7 @@ namespace LibAudio
virtual float get_sample() = 0;
protected:
AudioLoader() = default;
AudioStream() = default;
private:
void* m_mmap_addr { nullptr };
userspace/libraries/LibAudio/include/LibAudio/AudioLoaders/WAVLoader.h → userspace/libraries/LibAudio/include/LibAudio/AudioStreams/WAVAudioStream.h
+3 -3
View File
@@ -1,13 +1,13 @@
#pragma once
#include <LibAudio/AudioLoader.h>
#include <LibAudio/AudioStream.h>
#include <BAN/ByteSpan.h>
namespace LibAudio
{
class WAVAudioLoader : public AudioLoader
class WAVAudioStream : public AudioStream
{
public:
enum FormatCode : uint16_t
@@ -18,7 +18,7 @@ namespace LibAudio
public:
static bool can_load_from(BAN::ConstByteSpan data);
static BAN::ErrorOr<BAN::UniqPtr<AudioLoader>> create(BAN::ConstByteSpan data);
static BAN::ErrorOr<BAN::UniqPtr<AudioStream>> create(BAN::ConstByteSpan data);
uint32_t channels() const override { return m_channels; }
uint32_t sample_rate() const override { return m_sample_rate; }