From 3202239a93657d0cf013d6b128d30975a5ec8f64 Mon Sep 17 00:00:00 2001
From: Robbert van der Helm <mail@robbertvanderhelm.nl>
Date: Thu, 7 May 2020 16:39:20 +0200
Subject: [PATCH] Add speaker arrangement to event payload types

---
 src/common/events.h        | 3 +++
 src/common/logging.cpp     | 4 ++++
 src/common/serialization.h | 4 ++++
 3 files changed, 11 insertions(+)

diff --git a/src/common/events.h b/src/common/events.h
index 8fb19bb8..86d3ccea 100644
--- a/src/common/events.h
+++ b/src/common/events.h
@@ -257,6 +257,9 @@ auto passthrough_event(AEffect* plugin, F callback) {
                 [&](DynamicVstEvents& events) -> void* {
                     return &events.as_c_events();
                 },
+                [&](DynamicSpeakerArrangement& speaker_arrangement) -> void* {
+                    return &speaker_arrangement.as_c_speaker_arrangement();
+                },
                 [&](WantsChunkBuffer&) -> void* {
                     return string_buffer.data();
                 },
diff --git a/src/common/logging.cpp b/src/common/logging.cpp
index e6c13e92..0f3121d5 100644
--- a/src/common/logging.cpp
+++ b/src/common/logging.cpp
@@ -183,6 +183,10 @@ void Logger::log_event(bool is_dispatch,
                 [&](const DynamicVstEvents& events) {
                     message << "<" << events.events.size() << " midi_events>";
                 },
+                [&](const DynamicSpeakerArrangement& speaker_arrangement) {
+                    message << "<" << speaker_arrangement.speakers.size()
+                            << " speakers>";
+                },
                 [&](const WantsChunkBuffer&) {
                     message << "<writable_buffer>";
                 },
diff --git a/src/common/serialization.h b/src/common/serialization.h
index 750ead55..931f4c78 100644
--- a/src/common/serialization.h
+++ b/src/common/serialization.h
@@ -333,6 +333,7 @@ using EventPayload = std::variant<std::nullptr_t,
                                   native_size_t,
                                   AEffect,
                                   DynamicVstEvents,
+                                  DynamicSpeakerArrangement,
                                   WantsChunkBuffer,
                                   VstIOProperties,
                                   VstMidiKeyName,
@@ -357,6 +358,9 @@ void serialize(S& s, EventPayload& payload) {
               },
               [](S& s, AEffect& effect) { s.object(effect); },
               [](S& s, DynamicVstEvents& events) { s.object(events); },
+              [](S& s, DynamicSpeakerArrangement& speaker_arrangement) {
+                  s.object(speaker_arrangement);
+              },
               [](S& s, VstIOProperties& props) { s.object(props); },
               [](S& s, VstMidiKeyName& key_name) { s.object(key_name); },
               [](S& s, VstParameterProperties& props) { s.object(props); },