From e57c642cfea786472491efed07f4d5362185b6a9 Mon Sep 17 00:00:00 2001
From: Robbert van der Helm <mail@robbertvanderhelm.nl>
Date: Sat, 13 Feb 2021 17:29:35 +0100
Subject: [PATCH] Also log IBStream metadata keys

---
 src/common/logging/vst3.cpp             | 15 ++++++++++++---
 src/common/serialization/vst3/bstream.h |  8 ++++----
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/common/logging/vst3.cpp b/src/common/logging/vst3.cpp
index d8cf49a5..c797de72 100644
--- a/src/common/logging/vst3.cpp
+++ b/src/common/logging/vst3.cpp
@@ -29,9 +29,18 @@
 std::string format_bstream(const YaBStream& stream) {
     std::ostringstream formatted;
     formatted << "<IBStream* ";
-    if (stream.supports_stream_attributes) {
-        // TODO: Log the keys for the stored values
-        formatted << "with meta data ";
+    if (stream.supports_stream_attributes && stream.attributes) {
+        formatted << "with meta data [";
+        for (bool first = true;
+             const auto& key_type : stream.attributes->keys_and_types()) {
+            if (!first) {
+                formatted << ", ";
+            }
+
+            formatted << key_type;
+            first = false;
+        }
+        formatted << "] ";
     }
     if (stream.file_name) {
         formatted << "for \"" << VST3::StringConvert::convert(*stream.file_name)
diff --git a/src/common/serialization/vst3/bstream.h b/src/common/serialization/vst3/bstream.h
index e6974d19..491192f0 100644
--- a/src/common/serialization/vst3/bstream.h
+++ b/src/common/serialization/vst3/bstream.h
@@ -112,15 +112,15 @@ class YaBStream : public Steinberg::IBStream,
      */
     std::optional<std::u16string> file_name;
 
-   private:
-    std::vector<uint8_t> buffer;
-    size_t seek_position = 0;
-
     /**
      * The stream's meta data if we've copied from a stream that supports meta
      * data.
      */
     std::optional<YaAttributeList> attributes;
+
+   private:
+    std::vector<uint8_t> buffer;
+    size_t seek_position = 0;
 };
 
 #pragma GCC diagnostic pop