summaryrefslogtreecommitdiff
path: root/src/audio/include
diff options
context:
space:
mode:
authorjacqueline <me@jacqueline.id.au>2023-01-26 18:32:32 +1100
committerjacqueline <me@jacqueline.id.au>2023-01-26 18:32:32 +1100
commit7b60f5f864997e94895305f23ed2716ad7d9acaa (patch)
treedc1a6d0f366bcbf8ee05070765fa91ffef7720eb /src/audio/include
parent3696512b387ceefd25c00830fb24ddd073c06e2c (diff)
downloadtangara-fw-7b60f5f864997e94895305f23ed2716ad7d9acaa.tar.gz
Make StreamInfo a PDO
Diffstat (limited to 'src/audio/include')
-rw-r--r--src/audio/include/stream_info.hpp46
1 files changed, 6 insertions, 40 deletions
diff --git a/src/audio/include/stream_info.hpp b/src/audio/include/stream_info.hpp
index ed3096bb..bf67364f 100644
--- a/src/audio/include/stream_info.hpp
+++ b/src/audio/include/stream_info.hpp
@@ -11,46 +11,12 @@
namespace audio {
-class StreamInfo {
- public:
- static auto Parse(CborValue& container) -> cpp::result<StreamInfo, CborError>;
-
- StreamInfo() = default;
- StreamInfo(const StreamInfo&) = default;
-
- ~StreamInfo() = default;
-
- auto Path() const -> const std::optional<std::string>& { return path_; }
- auto Path(const std::string_view& d) -> void { path_ = d; }
-
- auto Channels() const -> const std::optional<uint8_t>& { return channels_; }
-
- auto BitsPerSample(uint8_t bpp) -> void { bits_per_sample_ = bpp; }
-
- auto BitsPerSample() const -> const std::optional<uint8_t>& {
- return bits_per_sample_;
- }
-
- auto SampleRate(uint16_t rate) -> void { sample_rate_ = rate; }
-
- auto SampleRate() const -> const std::optional<uint16_t>& {
- return sample_rate_;
- }
-
- auto ChunkSize() const -> const std::optional<std::size_t>& {
- return chunk_size_;
- }
-
- auto ChunkSize(std::size_t s) -> void { chunk_size_ = s; }
-
- auto Encode(CborEncoder& enc) -> std::optional<CborError>;
-
- private:
- std::optional<std::string> path_;
- std::optional<uint8_t> channels_;
- std::optional<uint8_t> bits_per_sample_;
- std::optional<uint16_t> sample_rate_;
- std::optional<size_t> chunk_size_;
+struct StreamInfo {
+ std::optional<std::string> path;
+ std::optional<uint8_t> channels;
+ std::optional<uint8_t> bits_per_sample;
+ std::optional<uint16_t> sample_rate;
+ std::optional<size_t> chunk_size;
};
} // namespace audio