From c36208016eefcdfdeff045f675f74fdb69dddb52 Mon Sep 17 00:00:00 2001
From: jacqueline <me@jacqueline.id.au>
Date: Fri, 2 Dec 2022 17:25:53 +1100
Subject: better cbor handling

---
 src/audio/include/stream_info.hpp | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

(limited to 'src/audio/include/stream_info.hpp')

diff --git a/src/audio/include/stream_info.hpp b/src/audio/include/stream_info.hpp
index ca28dd4e..47bcaa45 100644
--- a/src/audio/include/stream_info.hpp
+++ b/src/audio/include/stream_info.hpp
@@ -7,22 +7,11 @@
 #include "cbor.h"
 #include "result.hpp"
 
-#include "cbor_decoder.hpp"
-#include "cbor_encoder.hpp"
-
 namespace audio {
 
 class StreamInfo {
  public:
-  enum ParseError {
-    WRONG_TYPE,
-    MISSING_MAP,
-    CBOR_ERROR,
-  };
-
-  static auto Create(const uint8_t* buffer, size_t length)
-      -> cpp::result<StreamInfo, ParseError>;
-  StreamInfo(cbor::MapDecoder*);
+  static auto Parse(CborValue& container) -> cpp::result<StreamInfo, CborError>;
 
   StreamInfo() = default;
   StreamInfo(const StreamInfo&) = default;
@@ -38,7 +27,7 @@ class StreamInfo {
     return sample_rate_;
   }
 
-  auto WriteToMap(cbor::Encoder& encoder) -> cpp::result<size_t, CborError>;
+  auto Encode(CborEncoder& enc) -> std::optional<CborError>;
 
  private:
   std::optional<std::string> path_;
-- 
cgit v1.2.3